diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 636cf18e..94f14331 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -111,8 +111,9 @@ pkg-config-preqs: pkg-config: $(HOST_DIR)/bin/pkg-config $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONF_VER).tar.gz | $(HOST_DIR)/bin pkg-config-preqs + $(REMOVE)/pkg-config-$(PKGCONF_VER) $(UNTAR)/pkg-config-$(PKGCONF_VER).tar.gz - set -e; cd $(BUILD_TMP)/pkg-config-$(PKGCONF_VER); \ + $(CHDIR)/pkg-config-$(PKGCONF_VER); \ ./configure \ --with-pc_path=$(PKG_CONFIG_PATH); \ $(MAKE); \ @@ -126,8 +127,9 @@ mkfs.jffs2: $(HOST_DIR)/bin/mkfs.jffs2 sumtool: $(HOST_DIR)/bin/sumtool $(HOST_DIR)/bin/mkfs.jffs2 \ $(HOST_DIR)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOST_DIR)/bin + $(REMOVE)/mtd-utils-$(MTD-UTILS_VER) $(UNTAR)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 - pushd $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER) && \ + $(CHDIR)/mtd-utils-$(MTD-UTILS_VER) && \ ./configure \ ZLIB_CFLAGS=" " \ ZLIB_LIBS="-lz" \ @@ -144,8 +146,9 @@ $(HOST_DIR)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOST_ mkimage: $(HOST_DIR)/bin/mkimage $(HOST_DIR)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOST_DIR)/bin + $(REMOVE)/u-boot-$(U_BOOT_VER) $(UNTAR)/u-boot-$(U_BOOT_VER).tar.bz2 - pushd $(BUILD_TMP)/u-boot-$(U_BOOT_VER) && \ + $(CHDIR)/u-boot-$(U_BOOT_VER) && \ $(MAKE) defconfig && \ $(MAKE) silentoldconfig && \ $(MAKE) tools-only @@ -154,18 +157,20 @@ $(HOST_DIR)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOST_DIR)/b zic: $(HOST_DIR)/bin/zic $(HOST_DIR)/bin/zic: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz | $(HOST_DIR)/bin + $(REMOVE)/tzcode mkdir $(BUILD_TMP)/tzcode && \ tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz - pushd $(BUILD_TMP)/tzcode && \ + $(CHDIR)/tzcode && \ $(MAKE) zic install -D -m 0755 $(BUILD_TMP)/tzcode/zic $(HOST_DIR)/bin/ $(REMOVE)/tzcode parted_host: $(HOST_DIR)/bin/parted $(HOST_DIR)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOST_DIR)/bin + $(REMOVE)/parted-$(PARTED_VER) $(UNTAR)/parted-$(PARTED_VER).tar.xz - cd $(BUILD_TMP)/parted-$(PARTED_VER) && \ + $(CHDIR)/parted-$(PARTED_VER) && \ $(PATCH)/parted-3.2-devmapper-1.patch && \ $(PATCH)/parted-3.2-sysmacros.patch && \ ./configure \ @@ -180,8 +185,9 @@ $(HOST_DIR)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOST_DIR)/bin mkfs.fat: $(HOST_DIR)/bin/mkfs.fat $(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOST_DIR)/bin + $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER) $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz - set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \ + $(CHDIR)/dosfstools-$(DOSFSTOOLS_VER); \ ./configure \ --without-udev \ ; \ @@ -194,8 +200,9 @@ $(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOS mtools: $(HOST_DIR)/bin/mtools $(HOST_DIR)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOST_DIR)/bin + $(REMOVE)/mtools-$(MTOOLS_VER) $(UNTAR)/mtools-$(MTOOLS_VER).tar.gz - set -e; cd $(BUILD_TMP)/mtools-$(MTOOLS_VER); \ + $(CHDIR)/mtools-$(MTOOLS_VER); \ ./configure; \ $(MAKE) install -D -m 0755 $(BUILD_TMP)/mtools-$(MTOOLS_VER)/mtools $(HOST_DIR)/bin/ @@ -204,8 +211,9 @@ $(HOST_DIR)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOST_DIR)/bin resize2fs: $(HOST_DIR)/bin/resize2fs $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST_DIR)/bin + $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz - cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \ + $(CHDIR)/e2fsprogs-$(E2FSPROGS_VER) && \ ./configure; \ $(MAKE) install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/resize/resize2fs $(HOST_DIR)/bin/ diff --git a/make/crosstool.mk b/make/crosstool.mk index 20bd1dac..ce61de48 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -27,12 +27,10 @@ crosstools-renew: crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) $(REMOVE)/crosstool-ng - cd $(BUILD_TMP) && \ - git clone https://github.com/crosstool-ng/crosstool-ng && \ - cd crosstool-ng && \ - git checkout 1dbb06f2 && \ - unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ - cd $(BUILD_TMP)/crosstool-ng && \ + git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \ + $(CHDIR)/crosstool-ng && \ + git checkout 1dbb06f2 && \ + unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ @@ -59,13 +57,11 @@ UCLIBC_VER=1.0.24 crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) $(REMOVE)/crosstool-ng - cd $(BUILD_TMP) && \ - git clone https://github.com/crosstool-ng/crosstool-ng && \ - cd crosstool-ng && \ - git checkout 1dbb06f2 && \ - cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ - unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ - cd $(BUILD_TMP)/crosstool-ng && \ + git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \ + $(CHDIR)/crosstool-ng && \ + git checkout 1dbb06f2 && \ + cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ + unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ @@ -92,13 +88,11 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU crosstool-arm-hd51: CROSS_DIR-check make $(BUILD_TMP) $(REMOVE)/crosstool-ng - cd $(BUILD_TMP) && \ - git clone https://github.com/crosstool-ng/crosstool-ng && \ - cd crosstool-ng && \ - git checkout 1dbb06f2 && \ - cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ - unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ - cd $(BUILD_TMP)/crosstool-ng && \ + git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \ + $(CHDIR)/crosstool-ng && \ + git checkout 1dbb06f2 && \ + cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ + unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ diff --git a/make/devel-tools.mk b/make/devel-tools.mk index b0812da9..a36550bc 100644 --- a/make/devel-tools.mk +++ b/make/devel-tools.mk @@ -1,20 +1,26 @@ #Makefile to build devel-tools +# ----------------------------------------------------------------------------- + valgrind: valgrind-$(BOXSERIES) +# ----------------------------------------------------------------------------- + $(D)/valgrind-hd51 \ $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/valgrind-$(VALGRIND_VER) $(UNTAR)/valgrind-$(VALGRIND_VER).tar.bz2 - cd $(BUILD_TMP)/valgrind-$(VALGRIND_VER) && \ - $(PATCH)/valgrind-fix-$(BOXSERIES)-build.patch && \ - export AR=$(TARGET)-ar && \ - autoreconf -fi && \ + $(CHDIR)/valgrind-$(VALGRIND_VER); \ + $(PATCH)/valgrind-fix-$(BOXSERIES)-build.patch; \ + export AR=$(TARGET)-ar; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --enable-only32bit \ --mandir=/.remove \ - --datadir=/.remove && \ - $(MAKE) all && \ + --datadir=/.remove \ + ; \ + $(MAKE) all; \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc rm $(TARGET_DIR)/bin/callgrind_annotate @@ -23,44 +29,54 @@ $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR) rm $(TARGET_DIR)/bin/cg_diff rm $(TARGET_DIR)/bin/ms_print $(REMOVE)/valgrind-$(VALGRIND_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/valgrind-hd1: - svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind && \ - pushd $(BUILD_TMP)/valgrind && \ - svn up --force -r {2011-12-13} VEX && \ - $(PATCH)/valgrind12305-nevis-patch.diff && \ - $(PATCH)/valgrind-automake-1.11.2.patch && \ - autoreconf -fi && \ + $(REMOVE)/valgrind + svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind; \ + $(CHDIR)/valgrind; \ + svn up --force -r {2011-12-13} VEX; \ + $(PATCH)/valgrind12305-nevis-patch.diff; \ + $(PATCH)/valgrind-automake-1.11.2.patch; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --enable-only32bit \ --mandir=/.remove \ - --datadir=/.remove && \ - $(MAKE) all && \ + --datadir=/.remove \ + ; \ + $(MAKE) all; \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc $(REMOVE)/valgrind - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/strace-$(STRACE_VER) $(UNTAR)/strace-$(STRACE_VER).tar.xz - cd $(BUILD_TMP)/strace-$(STRACE_VER) && \ + $(CHDIR)/strace-$(STRACE_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=$(BUILD_TMP)/.remove \ - --enable-silent-rules && \ - $(MAKE) all && \ + --enable-silent-rules \ + ; \ + $(MAKE) all; \ make install prefix=$(TARGET_DIR) rm $(TARGET_DIR)/bin/strace-graph rm $(TARGET_DIR)/bin/strace-log-merge $(REMOVE)/strace-$(STRACE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_DIR) $(REMOVE)/gdb-$(GDB_VER) $(UNTAR)/gdb-$(GDB_VER).tar.xz - set -e; cd $(BUILD_TMP)/gdb-$(GDB_VER); \ + $(CHDIR)/gdb-$(GDB_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=$(BUILD_TMP)/.remove \ @@ -69,10 +85,11 @@ $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_ --disable-werror \ --with-curses \ --with-zlib \ - --enable-static; \ + --enable-static \ + ; \ $(MAKE) all-gdb; \ make install-gdb prefix=$(TARGET_DIR) rm -rf $(TARGET_DIR)/share/gdb/system-gdbinit find $(TARGET_DIR)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- $(REMOVE)/gdb-$(GDB_VER) - touch $@ + $(TOUCH) diff --git a/make/environment.mk b/make/environment.mk index 7ea171ad..38c03b5c 100644 --- a/make/environment.mk +++ b/make/environment.mk @@ -267,6 +267,9 @@ PATCH = patch -p1 -i $(PATCHES) # wget tarballs into archive directory WGET = wget -t3 -T60 -c -P $(ARCHIVE) +CHDIR = set -e; cd $(BUILD_TMP) +TOUCH = @touch $@ + CONFIGURE_OPTS = \ --build=$(BUILD) --host=$(TARGET) diff --git a/make/ffmpeg-arm.mk b/make/ffmpeg-arm.mk index 3f07a247..8f1f26e6 100644 --- a/make/ffmpeg-arm.mk +++ b/make/ffmpeg-arm.mk @@ -351,10 +351,10 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR) $(REMOVE)/ffmpeg-$(FFMPEG_VER) $(UNTAR)/$(FFMPEG_SOURCE) ifneq ($(FFMPEG_UNPATCHED), yes) - set -e; cd $(BUILD_TMP)/ffmpeg-$(FFMPEG_VER); \ + $(CHDIR)/ffmpeg-$(FFMPEG_VER); \ $(call apply_patches, $(FFMPEG_PATCH)) endif - set -e; cd $(BUILD_TMP)/ffmpeg-$(FFMPEG_VER); \ + $(CHDIR)/ffmpeg-$(FFMPEG_VER); \ ./configure \ $(FFMPEG_CONFIGURE_GENERIC) \ $(FFMPEG_CONFIGURE_PLATFORM) \ @@ -369,4 +369,4 @@ endif $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc $(REMOVE)/ffmpeg-$(FFMPEG_VER) - touch $@ + $(TOUCH) diff --git a/make/ffmpeg-cst.mk b/make/ffmpeg-cst.mk index 229aa153..be3fb040 100644 --- a/make/ffmpeg-cst.mk +++ b/make/ffmpeg-cst.mk @@ -176,9 +176,9 @@ endif $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) $(REMOVE)/$(NI_FFMPEG) cd $(SOURCE_DIR)/$(NI_FFMPEG) && \ - git checkout $(NI_FFMPEG_BRANCH) && \ + git checkout $(NI_FFMPEG_BRANCH) tar -C $(SOURCE_DIR) -cp $(NI_FFMPEG) --exclude-vcs | tar -C $(BUILD_TMP) -x - cd $(BUILD_TMP)/$(NI_FFMPEG) && \ + $(CHDIR)/$(NI_FFMPEG); \ ./configure \ $(FFMPEG_CONFIGURE_GENERIC) \ $(FFMPEG_CONFIGURE_PLATFORM) \ @@ -193,4 +193,4 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc $(REMOVE)/$(NI_FFMPEG) - touch $@ + $(TOUCH) diff --git a/make/gstreamer.mk b/make/gstreamer.mk index 699db887..c0ad11ff 100644 --- a/make/gstreamer.mk +++ b/make/gstreamer.mk @@ -1,5 +1,7 @@ # makefile to build gstreamer and all it's dependencies +# ----------------------------------------------------------------------------- + # change to activate debug GSTREAMER_DEBUG = yes @@ -10,6 +12,8 @@ ifeq ($(GSTREAMER_DEBUG), yes) GST_PLUGIN_CONFIG_DEBUG = --enable-debug endif +# ----------------------------------------------------------------------------- + # # gstreamer # @@ -21,7 +25,8 @@ $(ARCHIVE)/$(GSTREAMER_SOURCE): $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE) $(UNTAR)/$(GSTREAMER_SOURCE) - set -e; cd $(BUILD_TMP)/gstreamer-$(GSTREAMER_VER); \ + $(REMOVE)/gstreamer-$(GSTREAMER_VER) + $(CHDIR)/gstreamer-$(GSTREAMER_VER); \ $(PATCH)/gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch; \ ./autogen.sh --noconfigure; \ $(CONFIGURE) \ @@ -40,7 +45,7 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST --disable-benchmarks \ --disable-gtk-doc-html \ ac_cv_header_valgrind_valgrind_h=no \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-1.0.pc @@ -55,7 +60,9 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST $(REWRITE_LIBTOOLDEP)/libgstcontroller-1.0.la $(REWRITE_LIBTOOLDEP)/libgstnet-1.0.la $(REMOVE)/gstreamer-$(GSTREAMER_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugins_base @@ -67,8 +74,9 @@ $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE): $(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE_SOURCE) $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa-lib $(D)/libogg $(D)/libvorbisidec $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) + $(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER) $(UNTAR)/$(GST_PLUGINS_BASE_SOURCE) - set -e; cd $(BUILD_TMP)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \ + $(CHDIR)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \ $(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-Makefile.am-don-t-hardcode-libtool-name-when-running.patch; \ $(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch; \ $(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-riff-media-added-fourcc-to-all-ffmpeg-mpeg4-video-caps.patch; \ @@ -83,11 +91,12 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa $(GST_PLUGIN_CONFIG_DEBUG) \ --disable-examples \ --disable-gtk-doc-html \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-allocators-1.0.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-app-1.0.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-audio-1.0.pc @@ -123,7 +132,9 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa $(REWRITE_LIBTOOLDEP)/libgsttag-1.0.la $(REWRITE_LIBTOOLDEP)/libgstvideo-1.0.la $(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugins_good @@ -135,8 +146,9 @@ $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE): $(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD_SOURCE) $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_base $(D)/libsoup $(D)/libFLAC $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE) + $(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER) $(UNTAR)/$(GST_PLUGINS_GOOD_SOURCE) - set -e; cd $(BUILD_TMP)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER); \ + $(CHDIR)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER); \ $(PATCH)/gst-plugins-good-$(GSTREAMER_VER)-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch; \ ./autogen.sh --noconfigure; \ $(CONFIGURE) \ @@ -147,13 +159,16 @@ $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_ $(GST_PLUGIN_CONFIG_DEBUG) \ --disable-examples \ --disable-gtk-doc-html \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugins_bad @@ -165,8 +180,9 @@ $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE): $(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD_SOURCE) $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/librtmp $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE) + $(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER) $(UNTAR)/$(GST_PLUGINS_BAD_SOURCE) - set -e; cd $(BUILD_TMP)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER); \ + $(CHDIR)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER); \ $(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-Makefile.am-don-t-hardcode-libtool-name-when-running-pbad.patch; \ $(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-rtmp-fix-seeking-and-potential-segfault.patch; \ $(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-rtmp-hls-tsdemux-fix.patch; \ @@ -185,11 +201,12 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li $(GST_PLUGIN_CONFIG_DEBUG) \ --disable-examples \ --disable-gtk-doc-html \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-codecparsers-1.0.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-audio-1.0.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-base-1.0.pc @@ -213,7 +230,9 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li $(REWRITE_LIBTOOLDEP)/libgstadaptivedemux-1.0.la $(REWRITE_LIBTOOLDEP)/libgstbadvideo-1.0.la $(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugins_ugly @@ -225,8 +244,9 @@ $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE): $(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY_SOURCE) $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE) + $(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER) $(UNTAR)/$(GST_PLUGINS_UGLY_SOURCE) - set -e; cd $(BUILD_TMP)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER); \ + $(CHDIR)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER); \ ./autogen.sh --noconfigure; \ $(CONFIGURE) \ --prefix= \ @@ -236,13 +256,16 @@ $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLU $(GST_PLUGIN_CONFIG_DEBUG) \ --disable-examples \ --disable-gtk-doc-html \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugin_subsink @@ -254,8 +277,9 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g then cd $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; git pull; \ else cd $(ARCHIVE); git clone git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; \ fi + $(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink cp -ra $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(BUILD_TMP)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink - set -e; cd $(BUILD_TMP)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink; \ + $(CHDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink; \ aclocal --force -I m4; \ libtoolize --copy --ltdl --force; \ autoconf --force; \ @@ -264,13 +288,16 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g $(CONFIGURE) \ --prefix= \ --enable-silent-rules \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gst_plugins_dvbmediasink @@ -282,8 +309,9 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu then cd $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; git pull; \ else cd $(ARCHIVE); git clone -b gst-1.0 https://github.com/OpenPLi/gst-plugin-dvbmediasink.git gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; \ fi + $(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink cp -ra $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(BUILD_TMP)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink - set -e; cd $(BUILD_TMP)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink; \ + $(CHDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink; \ aclocal --force -I m4; \ libtoolize --copy --ltdl --force; \ autoconf --force; \ @@ -303,15 +331,16 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu --with-vb9 \ --with-spark \ --with-gstversion=1.0 \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \ - $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done + $(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \ + done $(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink - touch $@ + $(TOUCH) -########################################################################################################## +# ----------------------------------------------------------------------------- # # orc @@ -323,12 +352,13 @@ $(ARCHIVE)/$(ORC_SOURCE): $(WGET) https://gstreamer.freedesktop.org/src/orc/$(ORC_SOURCE) $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE) + $(REMOVE)/orc-$(ORC_VER) $(UNTAR)/$(ORC_SOURCE) - set -e; cd $(BUILD_TMP)/orc-$(ORC_VER); \ + $(CHDIR)/orc-$(ORC_VER); \ $(CONFIGURE) \ --datarootdir=/.remove \ --prefix= \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/orc-0.4.pc @@ -337,7 +367,9 @@ $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE) $(REWRITE_LIBTOOLDEP)/liborc-test-0.4.la rm -f $(addprefix $(TARGET_DIR)/bin/,orc-bugreport orcc) $(REMOVE)/orc-$(ORC_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # libdca @@ -349,12 +381,13 @@ $(ARCHIVE)/$(LIBDCA_SOURCE): $(WGET) http://download.videolan.org/pub/videolan/libdca/$(LIBDCA_VER)/$(LIBDCA_SOURCE) $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE) + $(REMOVE)/libdca-$(LIBDCA_VER) $(UNTAR)/$(LIBDCA_SOURCE) - set -e; cd $(BUILD_TMP)/libdca-$(LIBDCA_VER); \ + $(CHDIR)/libdca-$(LIBDCA_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdca.pc @@ -362,7 +395,9 @@ $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE) $(REWRITE_LIBTOOL)/libdca.la rm -f $(addprefix $(TARGET_DIR)/bin/,extract_dca extract_dts) $(REMOVE)/libdca-$(LIBDCA_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # nettle @@ -374,19 +409,22 @@ $(ARCHIVE)/$(NETTLE_SOURCE): $(WGET) https://ftp.gnu.org/gnu/nettle/$(NETTLE_SOURCE) $(D)/nettle: $(D)/gmp $(ARCHIVE)/$(NETTLE_SOURCE) + $(REMOVE)/nettle-$(NETTLE_VER) $(UNTAR)/$(NETTLE_SOURCE) - set -e; cd $(BUILD_TMP)/nettle-$(NETTLE_VER); \ + $(CHDIR)/nettle-$(NETTLE_VER); \ $(CONFIGURE) \ --prefix= \ --disable-documentation \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/hogweed.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/nettle.pc rm -f $(addprefix $(TARGET_DIR)/bin/,sexp-conv nettle-hash nettle-pbkdf2 nettle-lfib-stream pkcs1-conv) $(REMOVE)/nettle-$(NETTLE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gmp @@ -400,17 +438,20 @@ $(ARCHIVE)/$(GMP_SOURCE): $(WGET) ftp://ftp.gmplib.org/pub/gmp-$(GMP_VER_MAJOR)/$(GMP_SOURCE) $(D)/gmp: $(ARCHIVE)/$(GMP_SOURCE) + $(REMOVE)/gmp-$(GMP_VER_MAJOR) $(UNTAR)/$(GMP_SOURCE) - set -e; cd $(BUILD_TMP)/gmp-$(GMP_VER_MAJOR); \ + $(CHDIR)/gmp-$(GMP_VER_MAJOR); \ $(CONFIGURE) \ --prefix= \ --infodir=/.remove \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libgmp.la $(REMOVE)/gmp-$(GMP_VER_MAJOR) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # gnutls @@ -424,8 +465,9 @@ $(ARCHIVE)/$(GNUTLS_SOURCE): $(WGET) ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VER_MAJOR)/$(GNUTLS_SOURCE) $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE) + $(REMOVE)/gnutls-$(GNUTLS_VER) $(UNTAR)/$(GNUTLS_SOURCE) - set -e; cd $(BUILD_TMP)/gnutls-$(GNUTLS_VER); \ + $(CHDIR)/gnutls-$(GNUTLS_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -439,7 +481,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE) --disable-guile \ --disable-doc \ --without-p11-kit \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gnutls.pc @@ -448,7 +490,9 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE) $(REWRITE_LIBTOOLDEP)/libgnutlsxx.la rm -f $(addprefix $(TARGET_DIR)/bin/,psktool gnutls-cli-debug certtool srptool ocsptool gnutls-serv gnutls-cli) $(REMOVE)/gnutls-$(GNUTLS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # glib-networking @@ -462,18 +506,21 @@ $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE): $(WGET) https://ftp.acc.umu.se/pub/GNOME/sources/glib-networking/$(GLIB-NETWORKING_VER_MAJOR)/$(GLIB-NETWORKING_SOURCE) $(D)/glib-networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE) + $(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER) $(UNTAR)/$(GLIB-NETWORKING_SOURCE) - set -e; cd $(BUILD_TMP)/glib-networking-$(GLIB-NETWORKING_VER); \ + $(CHDIR)/glib-networking-$(GLIB-NETWORKING_VER); \ $(CONFIGURE) \ --prefix= \ --datadir=/.remove \ --datarootdir=/.remove \ --localedir=/.remove \ - ; \ + ; \ $(MAKE); \ $(MAKE) install prefix=$(TARGET_DIR) $(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # libsoup @@ -487,8 +534,9 @@ $(ARCHIVE)/$(LIBSOUP_SOURCE): $(WGET) https://download.gnome.org/sources/libsoup/$(LIBSOUP_VER_MAJOR)/$(LIBSOUP_SOURCE) $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE) + $(REMOVE)/libsoup-$(LIBSOUP_VER) $(UNTAR)/$(LIBSOUP_SOURCE) - set -e; cd $(BUILD_TMP)/libsoup-$(LIBSOUP_VER); \ + $(CHDIR)/libsoup-$(LIBSOUP_VER); \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ @@ -497,13 +545,15 @@ $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) itlocaledir=$$(TARGET_DIR)/.remove $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libsoup-2.4.pc $(REWRITE_LIBTOOL)/libsoup-2.4.la $(REMOVE)/libsoup-$(LIBSOUP_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # # sqlite @@ -515,16 +565,17 @@ $(ARCHIVE)/$(SQLITE_SOURCE): $(WGET) http://www.sqlite.org/2017/$(SQLITE_SOURCE) $(D)/sqlite: $(ARCHIVE)/$(SQLITE_SOURCE) + $(REMOVE)/sqlite-autoconf-$(SQLITE_VER) $(UNTAR)/$(SQLITE_SOURCE) - set -e; cd $(BUILD_TMP)/sqlite-autoconf-$(SQLITE_VER); \ + $(CHDIR)/sqlite-autoconf-$(SQLITE_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sqlite3.pc $(REWRITE_LIBTOOL)/libsqlite3.la rm -f $(addprefix $(TARGET_DIR)/bin/,sqlite3) $(REMOVE)/sqlite-autoconf-$(SQLITE_VER) - touch $@ + $(TOUCH) diff --git a/make/image-update.mk b/make/image-update.mk index 0fff381b..b4714d8d 100644 --- a/make/image-update.mk +++ b/make/image-update.mk @@ -42,7 +42,7 @@ u-FritzCallMonitor: echo "wget -q \"http://localhost/control/message?popup=FritzCallMonitor%20installed.\" -O /dev/null" >> $(POSTINSTALL_SH) echo "sleep 5" >> $(POSTINSTALL_SH) echo "/bin/sync" >> $(POSTINSTALL_SH) - mkdir -pv $(UPDATE_INST_DIR)/bin && \ + mkdir -pv $(UPDATE_INST_DIR)/bin && \ mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config && \ cp -f $(BIN)/FritzCallMonitor $(UPDATE_INST_DIR)/bin/ && \ cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/ @@ -221,7 +221,7 @@ pathauf_HD-19: u-update-bin: pushd $(BUILD_TMP) && \ - tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst + tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst echo $(UPDATE_URL)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VERSION)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION_STRING) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE) $(MAKE) u-clean diff --git a/make/kernel-arm.mk b/make/kernel-arm.mk index 429870ef..ad182c56 100644 --- a/make/kernel-arm.mk +++ b/make/kernel-arm.mk @@ -12,18 +12,18 @@ $(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) git checkout $(KERNEL_BRANCH) && \ tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x cd $(BUILD_TMP) && \ - mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \ + mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \ - touch .scmversion && \ - cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ - mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ + touch .scmversion && \ + cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ + mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER) && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \ cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB) && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \ - touch $@ + $(TOUCH) kernel-arm-modules: $(D)/kernel-arm cp -a $(MODULES_DIR)/kernel $(TARGETMODULES) diff --git a/make/kernel-cst.mk b/make/kernel-cst.mk index 64c65b42..3e6bbf34 100644 --- a/make/kernel-cst.mk +++ b/make/kernel-cst.mk @@ -42,15 +42,15 @@ kernel-cst-install-all: $(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGET_DIR) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ - git checkout $(KERNEL_BRANCH) && \ + git checkout $(KERNEL_BRANCH) tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x cd $(BUILD_TMP) && \ - mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \ + mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \ - touch .scmversion && \ - cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ - sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile && \ - mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ + touch .scmversion && \ + cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ + sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile && \ + mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \ @@ -64,7 +64,7 @@ ifeq ($(BOXFAMILY), apollo) cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz endif endif - touch $@ + $(TOUCH) kernel-cst-install-hd2: $(D)/kernel-cst-hd2 cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz @@ -74,19 +74,19 @@ $(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) git checkout $(KERNEL_BRANCH) && \ tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x cd $(BUILD_TMP) && \ - mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \ + mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \ - touch .scmversion && \ - cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ - sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile && \ - mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ + touch .scmversion && \ + cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \ + sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile && \ + mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \ $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \ mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img && \ mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img - touch $@ + $(TOUCH) kernel-cst-install-hd1: $(D)/kernel-cst-hd1 cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KERNEL_DESTDIR)/zImage diff --git a/make/neutrino.mk b/make/neutrino.mk index 0d7f5655..da98c2be 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -177,14 +177,14 @@ $(D)/neutrino: $(N_OBJDIR)/config.status $(MAKE) -C $(N_OBJDIR) all DESTDIR=$(TARGET_DIR) $(MAKE) -C $(N_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR) make $(TARGET_DIR)/.version - touch $@ + $(TOUCH) $(D)/libstb-hal: $(LH_OBJDIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(MAKE) -C $(LH_OBJDIR) all DESTDIR=$(TARGET_DIR) $(MAKE) -C $(LH_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR) $(REWRITE_LIBTOOL)/libstb-hal.la - touch $@ + $(TOUCH) neutrino-bin: ifeq ($(CLEAN), yes) diff --git a/make/plugins-extra.mk b/make/plugins-extra.mk index b83724c1..bd5909bb 100644 --- a/make/plugins-extra.mk +++ b/make/plugins-extra.mk @@ -4,8 +4,9 @@ links: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUG)/links.so $(LIBPLUG)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib $(LIBPLUG) $(VARCONF) + $(REMOVE)/links tar -C $(SOURCE_DIR)/$(TUXBOX_PLUGINS) -cp links --exclude-vcs | tar -C $(BUILD_TMP) -x - cd $(BUILD_TMP)/links && \ + $(CHDIR)/links && \ export CC=$(TARGET)-gcc && \ export AR=$(TARGET)-ar && \ export NM=$(TARGET)-nm && \ diff --git a/make/plugins.mk b/make/plugins.mk index bb85a9f7..91ffa2d5 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -240,9 +240,9 @@ openvpn-setup: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG) $(ETCINIT) neutrino-mediathek: $(LIBPLUG) $(REMOVE)/$@ git clone https://github.com/neutrino-mediathek/mediathek.git $(BUILD_TMP)/$@ - pushd $(BUILD_TMP)/$@ && \ - cp -a plugins/* $(LIBPLUG)/ && \ - cp -a share $(TARGET_DIR) + $(CHDIR)/$@; \ + cp -a plugins/* $(LIBPLUG)/; \ + cp -a share $(TARGET_DIR) $(REMOVE)/$@ #scripts-lua diff --git a/make/rootfs.mk b/make/rootfs.mk index 8a9d789a..0dad5154 100644 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -28,9 +28,7 @@ endif update.urls: $(TARGET_DIR)/var/etc/update.urls $(TARGET_DIR)/var/etc/update.urls: - rm -f $@ - touch $@ - echo "$(NI-SERVER)/update.php" >> $@ + echo "$(NI-SERVER)/update.php" > $@ echo "$(CHANLIST_URL)/$(CHANLIST_MD5FILE)" >> $@ # create filesystem for our images diff --git a/make/static.mk b/make/static.mk index 5b06ecfa..eef2ce43 100644 --- a/make/static.mk +++ b/make/static.mk @@ -9,9 +9,10 @@ endif cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/cortex-strings-$(CORTEX-STRINGS_VER) $(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 - pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \ - ./autogen.sh && \ + $(CHDIR)/cortex-strings-$(CORTEX-STRINGS_VER); \ + ./autogen.sh; \ CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \ CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \ CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \ @@ -21,8 +22,9 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN --prefix= \ --disable-shared \ --enable-static \ - $(CORTEX-STRINGS_CONF) && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(STATIC_DIR) && \ + $(CORTEX-STRINGS_CONF) \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(STATIC_DIR) $(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la $(REMOVE)/cortex-strings-$(CORTEX-STRINGS_VER) diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk index 3be7400f..151cae87 100644 --- a/make/system-libs-extra.mk +++ b/make/system-libs-extra.mk @@ -1,31 +1,38 @@ # makefile to build system libs (currently unused in ni-image) +# ----------------------------------------------------------------------------- + LIBID3TAG_VER=0.15.1b $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz: $(WGET) http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VER)/libid3tag-$(LIBID3TAG_VER).tar.gz $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libid3tag-$(LIBID3TAG_VER) $(UNTAR)/libid3tag-$(LIBID3TAG_VER).tar.gz - pushd $(BUILD_TMP)/libid3tag-$(LIBID3TAG_VER) && \ - $(PATCH)/libid3tag.diff && \ + $(CHDIR)/libid3tag-$(LIBID3TAG_VER); \ + $(PATCH)/libid3tag.diff; \ $(CONFIGURE) \ --prefix= \ - --enable-shared=yes && \ - $(MAKE) all && \ - make install DESTDIR=$(TARGET_DIR) && \ + --enable-shared=yes \ + ; \ + $(MAKE) all; \ + make install DESTDIR=$(TARGET_DIR); \ sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" id3tag.pc > $(PKG_CONFIG_PATH)/libid3tag.pc $(REWRITE_LIBTOOL)/libid3tag.la $(REMOVE)/libid3tag-$(LIBID3TAG_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- LIBFLAC_VER=1.3.2 $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz: $(WGET) http://prdownloads.sourceforge.net/sourceforge/flac/flac-$(LIBFLAC_VER).tar.xz $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/flac-$(LIBFLAC_VER) $(UNTAR)/flac-$(LIBFLAC_VER).tar.xz cp -f $(HELPERS_DIR)/new_autoconfig/* $(BUILD_TMP)/flac-$(LIBFLAC_VER) - set -e; cd $(BUILD_TMP)/flac-$(LIBFLAC_VER); \ + $(CHDIR)/flac-$(LIBFLAC_VER); \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ @@ -34,31 +41,36 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR) --disable-cpplibs \ --disable-xmms-plugin \ --disable-ogg \ - --disable-altivec; \ - $(MAKE) all && \ - make install DESTDIR=$(TARGET_DIR) && \ + --disable-altivec \ + ; \ + $(MAKE) all; \ + make install DESTDIR=$(TARGET_DIR); \ $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/flac.pc $(REWRITE_LIBTOOL)/libFLAC.la rm -rf $(TARGET_DIR)/bin/flac rm -rf $(TARGET_DIR)/bin/metaflac $(REMOVE)/flac-$(LIBFLAC_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- LIBROXML_VER=2.3.0 $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz: $(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libroxml-$(LIBROXML_VER) $(UNTAR)/libroxml-$(LIBROXML_VER).tar.gz - set -e; cd $(BUILD_TMP)/libroxml-$(LIBROXML_VER); \ + $(CHDIR)/libroxml-$(LIBROXML_VER); \ $(CONFIGURE) \ --prefix= \ --disable-xml-read-write \ --enable-xml-small-input-file \ --disable-xml-commit-xml-tree \ --disable-xml-xpath-engine \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc $(REMOVE)/libroxml-$(LIBROXML_VER) - touch $@ + $(TOUCH) diff --git a/make/system-libs.mk b/make/system-libs.mk index c544c17f..f9937222 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -6,10 +6,11 @@ ZLIB_PATCH = zlib-ldflags-tests.patch ZLIB_PATCH += zlib-remove.ldconfig.call.patch $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/zlib-$(ZLIB_VER) $(UNTAR)/zlib-$(ZLIB_VER).tar.gz - cd $(BUILD_TMP)/zlib-$(ZLIB_VER) && \ - $(call apply_patches, $(ZLIB_PATCH)) && \ - rm -rf config.cache && \ + $(CHDIR)/zlib-$(ZLIB_VER); \ + $(call apply_patches, $(ZLIB_PATCH)); \ + rm -rf config.cache; \ $(BUILDENV) \ CC=$(TARGET)-gcc \ LD=$(TARGET)-ld \ @@ -19,18 +20,20 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR) mandir=$(BUILD_TMP)/zlib-$(ZLIB_VER)/.remove \ ./configure \ --prefix= \ - --shared && \ - $(MAKE) && \ + --shared \ + ; \ + $(MAKE); \ $(MAKE) install prefix=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/zlib.pc $(REMOVE)/zlib-$(ZLIB_VER) - touch $@ + $(TOUCH) # ----------------------------------------------------------------------------- $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/fuse-$(FUSE_VER) $(UNTAR)/fuse-$(FUSE_VER).tar.gz - pushd $(BUILD_TMP)/fuse-$(FUSE_VER) && \ + $(CHDIR)/fuse-$(FUSE_VER); \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ @@ -40,8 +43,9 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR) --with-gnu-ld \ --enable-util \ --enable-lib \ - --enable-silent-rules && \ - $(MAKE) all && \ + --enable-silent-rules \ + ; \ + $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libfuse.la $(REWRITE_LIBTOOL)/libulockmgr.la @@ -49,55 +53,68 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR) rm -rf $(TARGET_DIR)/etc/udev rm -rf $(TARGET_DIR)/etc/init.d/fuse $(REMOVE)/fuse-$(FUSE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/libupnp-$(LIBUPNP_VER) $(UNTAR)/libupnp-$(LIBUPNP_VER).tar.bz2 - pushd $(BUILD_TMP)/libupnp-$(LIBUPNP_VER) && \ + $(CHDIR)/libupnp-$(LIBUPNP_VER); \ $(CONFIGURE) \ --prefix= \ --enable-shared \ - --disable-static && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(TARGET_DIR) && \ + --disable-static \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REMOVE)/libupnp-$(LIBUPNP_VER) $(REWRITE_LIBTOOL)/libixml.la $(REWRITE_LIBTOOL)/libthreadutil.la $(REWRITE_LIBTOOL)/libupnp.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libupnp.pc - touch $@ + $(TOUCH) +# ----------------------------------------------------------------------------- + $(D)/libdvbsi: | $(TARGET_DIR) $(REMOVE)/libdvbsi++ git clone git://github.com/OpenDMM/libdvbsi-.git $(BUILD_TMP)/libdvbsi++ - cd $(BUILD_TMP)/libdvbsi++; \ + $(CHDIR)/libdvbsi++; \ $(PATCH)/libdvbsi++-content_identifier_descriptor.patch; \ $(CONFIGURE) \ --prefix= \ --enable-shared \ --enable-silent-rules \ - --disable-static; \ + --disable-static \ + ; \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR); \ $(REMOVE)/libdvbsi++ $(REWRITE_LIBTOOL)/libdvbsi++.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdvbsi++.pc - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/giflib-$(GIFLIB_VER) $(UNTAR)/giflib-$(GIFLIB_VER).tar.bz2 - pushd $(BUILD_TMP)/giflib-$(GIFLIB_VER) && \ - export ac_cv_prog_have_xmlto=no && \ + $(CHDIR)/giflib-$(GIFLIB_VER); \ + export ac_cv_prog_have_xmlto=no; \ $(CONFIGURE) \ --prefix= \ --disable-static \ --enable-shared \ - --bindir=/.remove && \ - $(MAKE) all && \ + --bindir=/.remove \ + ; \ + $(MAKE) all; \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libgif.la $(REMOVE)/giflib-$(GIFLIB_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- CURL_IPV6="--enable-ipv6" ifeq ($(BOXSERIES), hd1) @@ -105,8 +122,9 @@ ifeq ($(BOXSERIES), hd1) endif $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/curl-$(LIBCURL_VER) $(UNTAR)/curl-$(LIBCURL_VER).tar.bz2 - pushd $(BUILD_TMP)/curl-$(LIBCURL_VER) && \ + $(CHDIR)/curl-$(LIBCURL_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -132,17 +150,20 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl --with-ssl=$(TARGET_DIR) \ --with-librtmp=$(TARGET_DIR)/lib \ $(CURL_IPV6) \ - --enable-optimize && \ - $(MAKE) all && \ - mkdir -p $(HOST_DIR)/bin && \ - sed -e "s,^prefix=,prefix=$(TARGET_DIR)," < curl-config > $(HOST_DIR)/bin/curl-config && \ - chmod 755 $(HOST_DIR)/bin/curl-config && \ + --enable-optimize \ + ; \ + $(MAKE) all; \ + mkdir -p $(HOST_DIR)/bin; \ + sed -e "s,^prefix=,prefix=$(TARGET_DIR)," < curl-config > $(HOST_DIR)/bin/curl-config; \ + chmod 755 $(HOST_DIR)/bin/curl-config; \ make install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/curl-config $(TARGET_DIR)/share/zsh $(REWRITE_LIBTOOL)/libcurl.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc $(REMOVE)/curl-$(LIBCURL_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- LIBPNG_CONF = ifneq ($(BOXSERIES), hd51) @@ -150,32 +171,36 @@ ifneq ($(BOXSERIES), hd51) endif $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGET_DIR) + $(REMOVE)/libpng-$(LIBPNG_VER) $(UNTAR)/libpng-$(LIBPNG_VER).tar.xz - pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER) && \ - $(PATCH)/libpng-Disable-pngfix-and-png-fix-itxt.patch && \ + $(CHDIR)/libpng-$(LIBPNG_VER); \ + $(PATCH)/libpng-Disable-pngfix-and-png-fix-itxt.patch; \ $(CONFIGURE) \ --prefix=$(TARGET_DIR) \ --bindir=$(HOST_DIR)/bin \ --mandir=$(BUILD_TMP)/.remove \ --enable-silent-rules \ $(LIBPNG_CONF) \ - --disable-static && \ - ECHO=echo $(MAKE) all && \ + --disable-static \ + ; \ + ECHO=echo $(MAKE) all; \ make install $(REMOVE)/libpng-$(LIBPNG_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGET_DIR) $(REMOVE)/freetype-$(FREETYPE_VER) $(UNTAR)/freetype-$(FREETYPE_VER).tar.bz2 - pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER) && \ + $(CHDIR)/freetype-$(FREETYPE_VER); \ $(PATCH)/freetype2_subpixel.patch; \ sed -i '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg - pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER)/builds/unix && \ - libtoolize --force --copy && \ - aclocal -I . && \ + $(CHDIR)/freetype-$(FREETYPE_VER)/builds/unix; \ + libtoolize --force --copy; \ + aclocal -I .; \ autoconf - pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER) && \ + $(CHDIR)/freetype-$(FREETYPE_VER); \ $(CONFIGURE) \ --prefix=$(TARGET_DIR) \ --mandir=$(BUILD_TMP)/.remove \ @@ -187,17 +212,20 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 --without-harfbuzz \ --without-bzip2 \ ; \ - $(MAKE) all && \ - make install && \ - ln -sf ./freetype2/freetype $(TARGET_INCLUDE_DIR)/freetype && \ + $(MAKE) all; \ + make install; \ + ln -sf ./freetype2/freetype $(TARGET_INCLUDE_DIR)/freetype; \ mv $(TARGET_DIR)/bin/freetype-config $(HOST_DIR)/bin/freetype-config $(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_DIR)/share/aclocal - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER) $(UNTAR)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz - cd $(BUILD_TMP)/libjpeg-turbo-$(LIBJPEG-TURBO_VER) && \ - export CC=$(TARGET)-gcc && \ + $(CHDIR)/libjpeg-turbo-$(LIBJPEG-TURBO_VER); \ + export CC=$(TARGET)-gcc; \ $(CONFIGURE) \ --prefix= \ --enable-shared \ @@ -205,13 +233,16 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DI --bindir=/.remove \ --datadir=/.remove \ --datarootdir=/.remove \ - --disable-static && \ - $(MAKE) && \ + --disable-static \ + ; \ + $(MAKE) ; \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libjpeg.la rm -f $(TARGET_LIB_DIR)/libturbojpeg* $(TARGET_INCLUDE_DIR)/turbojpeg.h $(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- OPENSSLFLAGS = CC=$(TARGET)-gcc \ LD=$(TARGET)-ld \ @@ -222,9 +253,10 @@ OPENSSLFLAGS = CC=$(TARGET)-gcc \ PROCESSOR=ARM $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/openssl-$(OPENSSL_VER) $(UNTAR)/openssl-$(OPENSSL_VER).tar.gz - pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER) && \ - $(PATCH)/openssl-add-ni-specific-target.patch && \ + $(CHDIR)/openssl-$(OPENSSL_VER); \ + $(PATCH)/openssl-add-ni-specific-target.patch; \ ./Configure \ linux-armv4-ni \ shared \ @@ -237,10 +269,11 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGET_DIR) $(TARGET_LDFLAGS) \ -DOPENSSL_SMALL_FOOTPRINT \ --prefix=/ \ - --openssldir=/.remove && \ - make $(OPENSSLFLAGS) depend && \ - sed -i "s# build_tests##" Makefile && \ - make $(OPENSSLFLAGS) all && \ + --openssldir=/.remove \ + ; \ + make $(OPENSSLFLAGS) depend; \ + sed -i "s# build_tests##" Makefile; \ + make $(OPENSSLFLAGS) all; \ make install_sw INSTALL_PREFIX=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc @@ -251,12 +284,15 @@ ifneq ($(BOXSERIES), hd51) endif $(REMOVE)/openssl-$(OPENSSL_VER) chmod 0755 $(TARGET_LIB_DIR)/libcrypto.so.* $(TARGET_LIB_DIR)/libssl.so.* - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR) - $(UNTAR)/ncurses-$(LIBNCURSES_VER).tar.gz && \ - pushd $(BUILD_TMP)/ncurses-$(LIBNCURSES_VER) && \ - $(PATCH)/ncurses-gcc-5.x-MKlib_gen.patch && \ + $(REMOVE)/ncurses-$(LIBNCURSES_VER) + $(UNTAR)/ncurses-$(LIBNCURSES_VER).tar.gz; \ + $(CHDIR)/ncurses-$(LIBNCURSES_VER); \ + $(PATCH)/ncurses-gcc-5.x-MKlib_gen.patch; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -272,8 +308,9 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR) --without-debug \ --without-ada \ --without-profile \ - --without-cxx-binding && \ - $(MAKE) libs && \ + --without-cxx-binding \ + ; \ + $(MAKE) libs; \ $(MAKE) install.libs DESTDIR=$(TARGET_DIR) rm -rf $(HOST_DIR)/bin/ncurses* rm -rf $(TARGET_LIB_DIR)/libform* $(TARGET_LIB_DIR)/libmenu* $(TARGET_LIB_DIR)/libpanel* @@ -285,14 +322,16 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR) ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/ncurses.h ln -sf ./ncurses/term.h $(TARGET_INCLUDE_DIR)/term.h $(REMOVE)/ncurses-$(LIBNCURSES_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR) $(REMOVE)/$(NI_OPENTHREADS) tar -C $(SOURCE_DIR) -cp $(NI_OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x - cd $(BUILD_TMP)/$(NI_OPENTHREADS)/ && \ - rm -f CMakeCache.txt && \ - cmake \ + $(CHDIR)/$(NI_OPENTHREADS)/; \ + rm -f CMakeCache.txt; \ + cmake \ -DCMAKE_BUILD_TYPE="None" \ -DCMAKE_SYSTEM_NAME="Linux" \ -DCMAKE_SYSTEM_PROCESSOR="arm" \ @@ -300,68 +339,83 @@ $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR) -DCMAKE_INSTALL_PREFIX="" \ -DCMAKE_C_COMPILER="$(TARGET)-gcc" \ -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \ - -DCMAKE_LINKER="$(CROSS_DIR)/bin/$(TARGET)-ld" \ - -DCMAKE_RANLIB="$(CROSS_DIR)/bin/$(TARGET)-ranlib" \ - -DCMAKE_AR="$(CROSS_DIR)/bin/$(TARGET)-ar" \ - -DCMAKE_NM="$(CROSS_DIR)/bin/$(TARGET)-nm" \ - -DCMAKE_OBJDUMP="$(CROSS_DIR)/bin/$(TARGET)-objdump" \ - -DCMAKE_STRIP="$(CROSS_DIR)/bin/$(TARGET)-strip" \ + -DCMAKE_LINKER="$(TARGET)-ld" \ + -DCMAKE_RANLIB="$(TARGET)-ranlib" \ + -DCMAKE_AR="$(TARGET)-ar" \ + -DCMAKE_NM="$(TARGET)-nm" \ + -DCMAKE_OBJDUMP="$(TARGET)-objdump" \ + -DCMAKE_STRIP="$(TARGET)-strip" \ -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ - -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" && \ - $(MAKE) && \ + -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ + ; \ + $(MAKE); \ make install DESTDIR=$(TARGET_DIR) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc $(REMOVE)/$(NI_OPENTHREADS) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/libusb-$(LIBUSB_VER) $(UNTAR)/libusb-$(LIBUSB_VER).tar.bz2 - pushd $(BUILD_TMP)/libusb-$(LIBUSB_VER) && \ + $(CHDIR)/libusb-$(LIBUSB_VER); \ $(CONFIGURE) \ --prefix= \ - --disable-udev && \ - $(MAKE) && \ - make install DESTDIR=$(TARGET_DIR) && \ + --disable-udev \ + ; \ + $(MAKE); \ + make install DESTDIR=$(TARGET_DIR); \ $(REMOVE)/libusb-$(LIBUSB_VER) $(REWRITE_LIBTOOL)/libusb-$(LIBUSB_MAJ).la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb-$(LIBUSB_MAJ).pc - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/libusb | $(TARGET_DIR) + $(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER) $(UNTAR)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 - pushd $(BUILD_TMP)/libusb-compat-$(LIBUSB_COMPAT_VER) && \ + $(CHDIR)/libusb-compat-$(LIBUSB_COMPAT_VER); \ $(CONFIGURE) \ - --prefix= && \ - $(MAKE) && \ - make install DESTDIR=$(TARGET_DIR) && \ + --prefix= \ + ; \ + $(MAKE); \ + make install DESTDIR=$(TARGET_DIR); \ $(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER) mv $(TARGET_DIR)/bin/libusb-config $(HOST_DIR)/bin $(REWRITE_PKGCONF) $(HOST_DIR)/bin/libusb-config $(REWRITE_LIBTOOL)/libusb.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$(LIBGD_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/libgd-$(LIBGD_VER) $(UNTAR)/libgd-$(LIBGD_VER).tar.xz - pushd $(BUILD_TMP)/libgd-$(LIBGD_VER) && \ - ./bootstrap.sh && \ + $(CHDIR)/libgd-$(LIBGD_VER); \ + ./bootstrap.sh; \ $(CONFIGURE) \ --prefix= \ --bindir=/.remove \ --without-fontconfig \ --without-xpm \ - --without-x && \ - $(MAKE) && \ + --without-x \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/libgd-$(LIBGD_VER) $(REWRITE_LIBTOOL)/libgd.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gdlib.pc - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/$(LIBDPF_SOURCE) | $(TARGET_DIR) + $(REMOVE)/dpf-ax-git-$(LIBDPF_VER) $(UNTAR)/$(LIBDPF_SOURCE) - cd $(BUILD_TMP)/dpf-ax-git-$(LIBDPF_VER)/dpflib && \ + $(CHDIR)/dpf-ax-git-$(LIBDPF_VER)/dpflib; \ $(PATCH)/libdpf-crossbuild.diff; \ make libdpf.a CC=$(TARGET)-gcc PREFIX=$(TARGET_DIR); \ mkdir -p $(TARGET_INCLUDE_DIR)/libdpf; \ @@ -370,28 +424,36 @@ $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/$(LIBDPF_SOURCE) | $(TARGET_DIR) cp ../include/usbuser.h $(TARGET_INCLUDE_DIR)/libdpf/; \ cp libdpf.a $(TARGET_LIB_DIR)/ $(REMOVE)/dpf-ax-git-$(LIBDPF_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/lzo-$(LZO_VER) $(UNTAR)/lzo-$(LZO_VER).tar.gz - cd $(BUILD_TMP)/lzo-$(LZO_VER) && \ + $(CHDIR)/lzo-$(LZO_VER); \ $(CONFIGURE) \ --mandir=/.remove \ --docdir=/.remove \ - --prefix= && \ - $(MAKE) && \ + --prefix= \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/liblzo2.la $(REMOVE)/lzo-$(LZO_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/libsigc++-$(LIBSIGCPP_VER) $(UNTAR)/libsigc++-$(LIBSIGCPP_VER).tar.xz - set -e; cd $(BUILD_TMP)/libsigc++-$(LIBSIGCPP_VER); \ + $(CHDIR)/libsigc++-$(LIBSIGCPP_VER); \ $(CONFIGURE) \ --prefix= \ --disable-documentation \ - --enable-silent-rules; \ + --enable-silent-rules \ + ; \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR); \ ln -sf ./sigc++-2.0/sigc++ $(TARGET_INCLUDE_DIR)/sigc++ @@ -399,26 +461,33 @@ $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR) $(REWRITE_LIBTOOL)/libsigc-2.0.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sigc++-2.0.pc $(REMOVE)/libsigc++-$(LIBSIGCPP_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/expat-$(EXPAT_VER) $(UNTAR)/expat-$(EXPAT_VER).tar.gz - set -e; cd $(BUILD_TMP)/expat-$(EXPAT_VER); \ + $(CHDIR)/expat-$(EXPAT_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ --enable-shared \ - --disable-static; \ + --disable-static \ + ; \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/expat.pc $(REWRITE_LIBTOOL)/libexpat.la $(REMOVE)/expat-$(EXPAT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGET_DIR) + $(REMOVE)/luaexpat-$(LUA_EXPAT_VER) $(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.gz - set -e; cd $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER); \ + $(CHDIR)/luaexpat-$(LUA_EXPAT_VER); \ rm makefile*; \ $(PATCH)/luaexpat-makefile.diff; \ $(PATCH)/luaexpat-1.3.0-lua-5.2.patch; \ @@ -429,32 +498,38 @@ $(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGET $(MAKE) install LUA_LDIR=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER) rm -rf $(TARGET_DIR)/share/lua/$(LUA_ABIVER)/lxp/tests $(REMOVE)/luaexpat-$(LUA_EXPAT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/Lua-cURL$(LUACURL_VER) $(UNTAR)/Lua-cURL$(LUACURL_VER).tar.xz - set -e; cd $(BUILD_TMP)/Lua-cURL$(LUACURL_VER); \ + $(CHDIR)/Lua-cURL$(LUACURL_VER); \ $(PATCH)/lua-curl-Makefile.diff; \ $(BUILDENV) \ - CC=$(TARGET)-gcc \ - LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ - LUA_LMOD=/share/lua/$(LUA_ABIVER) \ - LIBDIR=$(TARGET_LIB_DIR) \ - LUA_INC=$(TARGET_INCLUDE_DIR) \ - CURL_LIBS="$(TARGET_LDFLAGS) -lcurl" \ - $(MAKE); \ - LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ - LUA_LMOD=/share/lua/$(LUA_ABIVER) \ - DESTDIR=$(TARGET_DIR) \ - $(MAKE) install + CC=$(TARGET)-gcc \ + LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ + LUA_LMOD=/share/lua/$(LUA_ABIVER) \ + LIBDIR=$(TARGET_LIB_DIR) \ + LUA_INC=$(TARGET_INCLUDE_DIR) \ + CURL_LIBS="$(TARGET_LDFLAGS) -lcurl" \ + $(MAKE); \ + LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ + LUA_LMOD=/share/lua/$(LUA_ABIVER) \ + DESTDIR=$(TARGET_DIR) \ + $(MAKE) install $(REMOVE)/Lua-cURL$(LUACURL_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGET_DIR) + $(REMOVE)/luaposix-$(LUAPOSIX_VER) $(UNTAR)/v$(LUAPOSIX_VER).tar.gz tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/slingshot --strip=1 -xf $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/gnulib --strip=1 -xf $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz - set -e; cd $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER); \ + $(CHDIR)/luaposix-$(LUAPOSIX_VER); \ $(PATCH)/luaposix-fix-build.patch; \ $(PATCH)/luaposix-fix-docdir-build.patch; \ export LUA=$(HOST_DIR)/bin/lua-$(LUA_VER); \ @@ -467,27 +542,36 @@ $(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/ --datarootdir=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) \ --mandir=$(TARGET_DIR)/.remove \ --docdir=$(TARGET_DIR)/.remove \ - --enable-silent-rules; \ + --enable-silent-rules \ + ; \ $(MAKE); \ $(MAKE) all check install - $(REMOVE)/luaposix-$(LUAPOSIX_VER) $(TARGET_DIR)/.remove - touch $@ + $(REMOVE)/luaposix-$(LUAPOSIX_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- # helper for luaposix build $(HOST_DIR)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/lua-$(LUA_VER) $(UNTAR)/lua-$(LUA_VER).tar.gz - set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \ + $(CHDIR)/lua-$(LUA_VER); \ $(PATCH)/lua-01-fix-coolstream-build.patch; \ $(MAKE) linux install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/lua $@ - $(REMOVE)/lua-$(LUA_VER) $(TARGET_DIR)/.remove + $(REMOVE)/lua-$(LUA_VER) + +# ----------------------------------------------------------------------------- lua-libs: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) | $(TARGET_DIR) cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/share/lua/5.2/* $(TARGET_DIR)/share/lua/$(LUA_ABIVER)/ +# ----------------------------------------------------------------------------- + $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/lua-$(LUA_VER) $(UNTAR)/lua-$(LUA_VER).tar.gz - set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \ + $(CHDIR)/lua-$(LUA_VER); \ $(PATCH)/lua-01-fix-coolstream-build.patch; \ $(PATCH)/lua-02-shared-libs-for-lua.patch; \ $(PATCH)/lua-03-lua-pc.patch; \ @@ -501,20 +585,23 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR) install -m 0644 -D $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc rm -rf $(TARGET_DIR)/bin/luac - $(REMOVE)/lua-$(LUA_VER) $(TARGET_DIR)/.remove + $(REMOVE)/lua-$(LUA_VER) make lua-libs - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- BLURAY_DEPS = $(D)/freetype ifeq ($(BOXSERIES), hd2) BLURAY_DEPS += $(D)/libaacs $(D)/libbdplus endif + $(D)/libbluray: $(BLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2 | $(TARGET_DIR) $(REMOVE)/libbluray-$(LIBBLURAY_VER) $(UNTAR)/libbluray-$(LIBBLURAY_VER).tar.bz2 - cd $(BUILD_TMP)/libbluray-$(LIBBLURAY_VER) && \ - $(PATCH)/libbluray.diff && \ - ./bootstrap && \ + $(CHDIR)/libbluray-$(LIBBLURAY_VER); \ + $(PATCH)/libbluray.diff; \ + ./bootstrap; \ $(CONFIGURE) \ --prefix= \ --enable-shared \ @@ -529,17 +616,21 @@ $(D)/libbluray: $(BLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2 | $ --disable-bdjava \ --without-libxml2 \ --without-fontconfig \ - $(BLURAY_CONFIGURE) && \ - $(MAKE) && \ + $(BLURAY_CONFIGURE) \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL)/libbluray.la - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbluray.pc + $(REWRITE_LIBTOOL)/libbluray.la + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbluray.pc $(REMOVE)/libbluray-$(LIBBLURAY_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/libass-$(LIBASS_VER) $(UNTAR)/libass-$(LIBASS_VER).tar.xz - pushd $(BUILD_TMP)/libass-$(LIBASS_VER) && \ + $(CHDIR)/libass-$(LIBASS_VER); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -547,20 +638,24 @@ $(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.x --disable-test \ --disable-fontconfig \ --disable-harfbuzz \ - --disable-require-system-font-provider && \ - $(MAKE) && \ + --disable-require-system-font-provider \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/libass-$(LIBASS_VER) $(REWRITE_LIBTOOL)/libass.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libass.pc - touch $@ + $(TOUCH) +# ----------------------------------------------------------------------------- + $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/libgpg-error-$(LIBGPG-ERROR_VER) $(UNTAR)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 - pushd $(BUILD_TMP)/libgpg-error-$(LIBGPG-ERROR_VER) && \ - pushd src/syscfg && \ + $(CHDIR)/libgpg-error-$(LIBGPG-ERROR_VER); \ + pushd src/syscfg; \ ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.linux-uclibcgnueabi.h; \ - popd; \ + popd; \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -568,8 +663,9 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE --datarootdir=/.remove \ --enable-maintainer-mode \ --enable-shared \ - --disable-static && \ - $(MAKE) && \ + --disable-static \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_DIR)/bin/gpg-error-config $(HOST_DIR)/bin $(REWRITE_PKGCONF) $(HOST_DIR)/bin/gpg-error-config @@ -577,11 +673,14 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE rm -rf $(TARGET_DIR)/bin/gpg-error rm -rf $(TARGET_DIR)/share/common-lisp $(REMOVE)/libgpg-error-$(LIBGPG-ERROR_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | $(TARGET_DIR) + $(REMOVE)/libgcrypt-$(LIBGCRYPT_VER) $(UNTAR)/libgcrypt-$(LIBGCRYPT_VER).tar.gz - pushd $(BUILD_TMP)/libgcrypt-$(LIBGCRYPT_VER) && \ + $(CHDIR)/libgcrypt-$(LIBGCRYPT_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -590,8 +689,9 @@ $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ - --disable-static && \ - $(MAKE) && \ + --disable-static \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_DIR)/bin/libgcrypt-config $(HOST_DIR)/bin $(REWRITE_PKGCONF) $(HOST_DIR)/bin/libgcrypt-config @@ -600,51 +700,62 @@ $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | rm -rf $(TARGET_DIR)/bin/hmac256 rm -rf $(TARGET_DIR)/bin/mpicalc $(REMOVE)/libgcrypt-$(LIBGCRYPT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libaacs: $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2 $(D)/libgcrypt | $(TARGET_DIR) + $(REMOVE)/libaacs-$(LIBAACS_VER) $(UNTAR)/libaacs-$(LIBAACS_VER).tar.bz2 - pushd $(BUILD_TMP)/libaacs-$(LIBAACS_VER) && \ - ./bootstrap && \ + $(CHDIR)/libaacs-$(LIBAACS_VER); \ + ./bootstrap; \ $(CONFIGURE) \ --prefix= \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ - --disable-static && \ - $(MAKE) && \ + --disable-static \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libaacs.pc $(REWRITE_LIBTOOL)/libaacs.la $(REMOVE)/libaacs-$(LIBAACS_VER) - cd $(TARGET_DIR) && \ + cd $(TARGET_DIR); \ mkdir -p .config/aacs .cache/aacs/vuk cp $(IMAGEFILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(TARGET_DIR) + $(REMOVE)/libbdplus-$(LIBBDPLUS_VER) $(UNTAR)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 - pushd $(BUILD_TMP)/libbdplus-$(LIBBDPLUS_VER) && \ - ./bootstrap && \ + $(CHDIR)/libbdplus-$(LIBBDPLUS_VER); \ + ./bootstrap; \ $(CONFIGURE) \ --prefix= \ --enable-maintainer-mode \ --enable-silent-rules \ --enable-shared \ - --disable-static && \ - $(MAKE) && \ + --disable-static \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbdplus.pc $(REWRITE_LIBTOOL)/libbdplus.la $(REMOVE)/libbdplus-$(LIBBDPLUS_VER) - cd $(TARGET_DIR) && \ + cd $(TARGET_DIR); \ mkdir -p .config/bdplus/vm0 cp -f $(IMAGEFILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0 - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libxml2-$(LIBXML2_VER) $(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz - pushd $(BUILD_TMP)/libxml2-$(LIBXML2_VER) && \ + $(CHDIR)/libxml2-$(LIBXML2_VER); \ $(CONFIGURE) \ --prefix= \ --enable-shared \ @@ -658,8 +769,9 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR) --without-docbook \ --without-mem-debug \ --without-lzma \ - --without-schematron && \ - $(MAKE) && \ + --without-schematron \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_DIR)/bin/xml2-config $(HOST_DIR)/bin $(REWRITE_LIBTOOL)/libxml2.la @@ -668,80 +780,90 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR) rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh rm -rf $(TARGET_LIB_DIR)/cmake $(REMOVE)/libxml2-$(LIBXML2_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- PUGIXML_PATCH = pugixml-config.patch $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/pugixml-$(PUGIXML_VER) $(UNTAR)/pugixml-$(PUGIXML_VER).tar.gz - set -e; cd $(BUILD_TMP)/pugixml-$(PUGIXML_VER); \ - $(call apply_patches, $(PUGIXML_PATCH)); \ - rm -f CMakeCache.txt && \ + $(CHDIR)/pugixml-$(PUGIXML_VER); \ + $(call apply_patches, $(PUGIXML_PATCH)); \ + rm -f CMakeCache.txt; \ cmake \ - --no-warn-unused-cli \ - -DBUILD_SHARED_LIBS="ON" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_BUILD_TYPE="None" \ - -DCMAKE_SYSTEM_NAME="Linux" \ - -DCMAKE_SYSTEM_PROCESSOR="arm" \ - -DCMAKE_C_COMPILER="$(TARGET)-gcc" \ - -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \ - -DCMAKE_LINKER="$(CROSS_DIR)/bin/$(TARGET)-ld" \ - -DCMAKE_RANLIB="$(CROSS_DIR)/bin/$(TARGET)-ranlib" \ - -DCMAKE_AR="$(CROSS_DIR)/bin/$(TARGET)-ar" \ - -DCMAKE_NM="$(CROSS_DIR)/bin/$(TARGET)-nm" \ - -DCMAKE_OBJDUMP="$(CROSS_DIR)/bin/$(TARGET)-objdump" \ - -DCMAKE_STRIP="$(CROSS_DIR)/bin/$(TARGET)-strip" \ - ; \ + --no-warn-unused-cli \ + -DBUILD_SHARED_LIBS="ON" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_BUILD_TYPE="None" \ + -DCMAKE_SYSTEM_NAME="Linux" \ + -DCMAKE_SYSTEM_PROCESSOR="arm" \ + -DCMAKE_C_COMPILER="$(TARGET)-gcc" \ + -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \ + -DCMAKE_LINKER="$(TARGET)-ld" \ + -DCMAKE_RANLIB="$(TARGET)-ranlib" \ + -DCMAKE_AR="$(TARGET)-ar" \ + -DCMAKE_NM="$(TARGET)-nm" \ + -DCMAKE_OBJDUMP="$(TARGET)-objdump" \ + -DCMAKE_STRIP="$(TARGET)-strip" \ + ; \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_DIR)/lib/cmake $(REMOVE)/pugixml-$(PUGIXML_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR) $(REMOVE)/$(NI_RTMPDUMP) tar -C $(SOURCE_DIR) -cp $(NI_RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x - set -e; cd $(BUILD_TMP)/$(NI_RTMPDUMP); \ + $(CHDIR)/$(NI_RTMPDUMP); \ make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_DIR)/include -L$(TARGET_DIR)/lib" LDFLAGS="-L$(TARGET_DIR)/lib" prefix=$(TARGET_DIR);\ - make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove ;\ - rm -rf $(TARGET_DIR)/.remove - rm -rf $(TARGET_DIR)/sbin/rtmpgw - rm -rf $(TARGET_DIR)/sbin/rtmpsrv - rm -rf $(TARGET_DIR)/sbin/rtmpsuck + make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove + rm -rf $(TARGET_DIR)/sbin/rtmpgw + rm -rf $(TARGET_DIR)/sbin/rtmpsrv + rm -rf $(TARGET_DIR)/sbin/rtmpsuck $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc $(REMOVE)/$(NI_RTMPDUMP) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/libtirpc-$(LIBTIRPC_VER) $(UNTAR)/libtirpc-$(LIBTIRPC_VER).tar.bz2 - cd $(BUILD_TMP)/libtirpc-$(LIBTIRPC_VER) && \ - $(PATCH)/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch && \ - $(PATCH)/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch && \ - $(PATCH)/libtirpc-0003-Add-rpcgen-program-from-nfs-utils-sources.patch && \ - $(PATCH)/libtirpc-0004-Automatically-generate-XDR-header-files-from-.x-sour.patch && \ - $(PATCH)/libtirpc-0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch && \ - $(PATCH)/libtirpc-0006-Disable-DES-authentification-support.patch && \ - $(PATCH)/libtirpc-0007-include-stdint.h-for-uintptr_t.patch && \ - autoreconf -fi && \ + $(CHDIR)/libtirpc-$(LIBTIRPC_VER); \ + $(PATCH)/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch; \ + $(PATCH)/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch; \ + $(PATCH)/libtirpc-0003-Add-rpcgen-program-from-nfs-utils-sources.patch; \ + $(PATCH)/libtirpc-0004-Automatically-generate-XDR-header-files-from-.x-sour.patch; \ + $(PATCH)/libtirpc-0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch; \ + $(PATCH)/libtirpc-0006-Disable-DES-authentification-support.patch; \ + $(PATCH)/libtirpc-0007-include-stdint.h-for-uintptr_t.patch; \ + autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ --disable-gssapi \ --enable-silent-rules \ - --mandir=/.remove && \ - $(MAKE) && \ + --mandir=/.remove \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libtirpc.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libtirpc.pc $(REMOVE)/libtirpc-$(LIBTIRPC_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/confuse-$(CONFUSE_VER) $(UNTAR)/confuse-$(CONFUSE_VER).tar.xz - set -e; cd $(BUILD_TMP)/confuse-$(CONFUSE_VER); \ + $(CHDIR)/confuse-$(CONFUSE_VER); \ $(CONFIGURE) \ --prefix= \ --docdir=/.remove \ @@ -749,15 +871,19 @@ $(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGET_DIR) --enable-silent-rules \ --enable-static \ --disable-shared \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libconfuse.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libconfuse.pc $(REMOVE)/confuse-$(CONFUSE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/libite-$(ITE_VER) $(UNTAR)/libite-$(ITE_VER).tar.xz - set -e; cd $(BUILD_TMP)/libite-$(ITE_VER); \ + $(CHDIR)/libite-$(ITE_VER); \ $(CONFIGURE) \ --prefix= \ --docdir=/.remove \ @@ -765,69 +891,84 @@ $(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR) --enable-silent-rules \ --enable-static \ --disable-shared \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libite.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libite.pc $(REMOVE)/libite-$(ITE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libmad-$(LIBMAD_VER) $(UNTAR)/libmad-$(LIBMAD_VER).tar.gz - pushd $(BUILD_TMP)/libmad-$(LIBMAD_VER) && \ - $(PATCH)/libmad-pc-fix.diff && \ - $(PATCH)/libmad-frame_length.diff && \ - $(PATCH)/libmad-mips-h-constraint-removal.patch && \ - $(PATCH)/libmad-remove-deprecated-cflags.patch && \ - $(PATCH)/libmad-thumb2-fixed-arm.patch && \ - $(PATCH)/libmad-thumb2-imdct-arm.patch && \ - touch NEWS AUTHORS ChangeLog && \ - autoreconf -fi && \ + $(CHDIR)/libmad-$(LIBMAD_VER); \ + $(PATCH)/libmad-pc-fix.diff; \ + $(PATCH)/libmad-frame_length.diff; \ + $(PATCH)/libmad-mips-h-constraint-removal.patch; \ + $(PATCH)/libmad-remove-deprecated-cflags.patch; \ + $(PATCH)/libmad-thumb2-fixed-arm.patch; \ + $(PATCH)/libmad-thumb2-imdct-arm.patch; \ + touch NEWS AUTHORS ChangeLog; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --enable-shared=yes \ --enable-accuracy \ --enable-fpm=arm \ - --enable-sso && \ - $(MAKE) all && \ - make install DESTDIR=$(TARGET_DIR) && \ + --enable-sso \ + ; \ + $(MAKE) all; \ + make install DESTDIR=$(TARGET_DIR); \ sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" mad.pc > $(PKG_CONFIG_PATH)/libmad.pc $(REWRITE_LIBTOOL)/libmad.la $(REMOVE)/libmad-$(LIBMAD_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libvorbisidec: $(ARCHIVE)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz $(D)/libogg | $(TARGET_DIR) + $(REMOVE)/libvorbisidec-$(LIBVORBISIDEC_VER) $(UNTAR)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz - pushd $(BUILD_TMP)/libvorbisidec-$(LIBVORBISIDEC_VER) && \ - sed -i '122 s/^/#/' configure.in && \ - autoreconf -fi && \ + $(CHDIR)/libvorbisidec-$(LIBVORBISIDEC_VER); \ + sed -i '122 s/^/#/' configure.in; \ + autoreconf -fi; \ $(BUILDENV) \ $(CONFIGURE) \ - --prefix= && \ - make all && \ - make install DESTDIR=$(TARGET_DIR) && \ + --prefix= \ + ; \ + make all; \ + make install DESTDIR=$(TARGET_DIR); \ $(REMOVE)/libvorbisidec-$(LIBVORBISIDEC_VER) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbisidec.pc $(REWRITE_LIBTOOL)/libvorbisidec.la - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/libogg-$(LIBOGG_VER) $(UNTAR)/libogg-$(LIBOGG_VER).tar.xz - pushd $(BUILD_TMP)/libogg-$(LIBOGG_VER) && \ + $(CHDIR)/libogg-$(LIBOGG_VER); \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ - --enable-shared && \ - $(MAKE) && \ + --enable-shared \ + ; \ + $(MAKE); \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ogg.pc $(REWRITE_LIBTOOL)/libogg.la $(REMOVE)/libogg-$(LIBOGG_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR) $(REMOVE)/fribidi-$(FRIBIDI_VER) $(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2 - set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \ + $(CHDIR)/fribidi-$(FRIBIDI_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -841,7 +982,9 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc $(REWRITE_LIBTOOL)/libfribidi.la $(REMOVE)/fribidi-$(FRIBIDI_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- LIBFFI_CONF = ifeq ($(BOXSERIES), hd1) @@ -849,24 +992,26 @@ ifeq ($(BOXSERIES), hd1) endif $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz + $(REMOVE)/libffi-$(LIBFFI_VER) $(UNTAR)/libffi-$(LIBFFI_VER).tar.gz - set -e; cd $(BUILD_TMP)/libffi-$(LIBFFI_VER); \ - $(PATCH)/libffi-install_headers.patch; \ + $(CHDIR)/libffi-$(LIBFFI_VER); \ + $(PATCH)/libffi-install_headers.patch; \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ $(LIBFFI_CONF) \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libffi.pc $(REWRITE_LIBTOOL)/libffi.la $(REMOVE)/libffi-$(LIBFFI_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- + +# glibc provides a stub gettext implementation, so we only build it for hd2 -# glibc provides a stub -# gettext implementation, -# so we only build it for hd2 LIBGLIB2_DEPS = ifeq ($(BOXSERIES), hd2) LIBGLIB2_DEPS = $(D)/gettext @@ -878,9 +1023,10 @@ ifeq ($(BOXSERIES), hd1) endif $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGET_DIR) + $(REMOVE)/glib-$(GLIB_VER) $(UNTAR)/glib-$(GLIB_VER).tar.xz - pushd $(BUILD_TMP)/glib-$(GLIB_VER); \ - $(PATCH)/libglib2-disable-tests.patch; \ + $(CHDIR)/glib-$(GLIB_VER); \ + $(PATCH)/libglib2-disable-tests.patch; \ echo "ac_cv_type_long_long=yes" > arm-linux.cache; \ echo "glib_cv_stack_grows=no" >> arm-linux.cache; \ echo "glib_cv_uscore=no" >> arm-linux.cache; \ @@ -927,11 +1073,14 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D $(REWRITE_LIBTOOLDEP)/libgobject-2.0.la $(REWRITE_LIBTOOLDEP)/libgthread-2.0.la $(REMOVE)/glib-$(GLIB_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) + $(REMOVE)/alsa-lib-$(ALSA-LIB_VER) $(UNTAR)/$(ALSA-LIB_SOURCE) - set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA-LIB_VER); \ + $(CHDIR)/alsa-lib-$(ALSA-LIB_VER); \ $(PATCH)/alsa-lib-$(ALSA-LIB_VER)-link_fix.patch; \ $(PATCH)/alsa-lib-$(ALSA-LIB_VER).patch; \ $(CONFIGURE) \ @@ -950,10 +1099,10 @@ $(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) --disable-alisp \ --disable-hwdep \ --disable-python \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/alsa.pc $(REWRITE_LIBTOOL)/libasound.la $(REMOVE)/alsa-lib-$(ALSA-LIB_VER) - touch $@ + $(TOUCH) diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk index c42c9d79..ceb0bee0 100644 --- a/make/system-tools-extra.mk +++ b/make/system-tools-extra.mk @@ -1,21 +1,25 @@ # makefile to build extra system tools (mostly unused) +# ----------------------------------------------------------------------------- + # usbutils-008 needs udev USB_UTILS_VER=007 $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz: $(WGET) https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$(USB_UTILS_VER).tar.xz $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/usbutils-$(USB_UTILS_VER) $(UNTAR)/usbutils-$(USB_UTILS_VER).tar.xz - cd $(BUILD_TMP)/usbutils-$(USB_UTILS_VER) && \ - $(PATCH)/usbutils-avoid-dependency-on-bash.patch && \ - $(PATCH)/usbutils-fix-null-pointer-crash.patch && \ + $(CHDIR)/usbutils-$(USB_UTILS_VER); \ + $(PATCH)/usbutils-avoid-dependency-on-bash.patch; \ + $(PATCH)/usbutils-fix-null-pointer-crash.patch; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ --mandir=/.remove \ - --infodir=/.remove && \ - $(MAKE) && \ + --infodir=/.remove \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/lsusb.py rm -rf $(TARGET_DIR)/bin/usbhid-dump @@ -23,15 +27,18 @@ $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz | rm -rf $(TARGET_DIR)/share/pkgconfig rm -rf $(TARGET_DIR)/share/usb.ids.gz $(REMOVE)/usbutils-$(USB_UTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- BINUTILS_VER=2.25 $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2: $(WGET) https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2 $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/binutils-$(BINUTILS_VER) $(UNTAR)/binutils-$(BINUTILS_VER).tar.bz2 - cd $(BUILD_TMP)/binutils-$(BINUTILS_VER) && \ + $(CHDIR)/binutils-$(BINUTILS_VER); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -40,43 +47,52 @@ $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR) --disable-plugins \ --enable-build-warnings=no \ --disable-sim \ - --disable-gdb && \ + --disable-gdb \ + ; \ $(MAKE) install -m755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objdump $(BIN)/ install -m755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objcopy $(BIN)/ $(REMOVE)/binutils-$(BINUTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- UTIL-LINUX_VER=2.29 $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz: $(WGET) https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER)/util-linux-$(UTIL-LINUX_VER).tar.xz $(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/util-linux-$(UTIL-LINUX_VER) $(UNTAR)/util-linux-$(UTIL-LINUX_VER).tar.xz - cd $(BUILD_TMP)/util-linux-$(UTIL-LINUX_VER) && \ - autoreconf -fi && \ + $(CHDIR)/util-linux-$(UTIL-LINUX_VER); \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --build=$(BUILD) \ --host=$(TARGET) \ --enable-static \ --disable-shared \ - --mandir=/.remove && \ - $(MAKE) sfdisk && \ + --mandir=/.remove \ + ; \ + $(MAKE) sfdisk; \ install -m755 sfdisk $(TARGET_DIR)/sbin/sfdisk $(REMOVE)/util-linux-$(UTIL-LINUX_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- IPTABLES_VER = 1.4.21 $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2: $(WGET) http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VER).tar.bz2 $(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/iptables-$(IPTABLES_VER) $(UNTAR)/iptables-$(IPTABLES_VER).tar.bz2 - set -e; cd $(BUILD_TMP)/iptables-$(IPTABLES_VER); \ + $(CHDIR)/iptables-$(IPTABLES_VER); \ $(CONFIGURE) \ --prefix= \ - --mandir=/.remove; \ + --mandir=/.remove \ + ; \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libip4tc.la @@ -88,30 +104,36 @@ $(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libiptc.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/xtables.pc $(REMOVE)/iptables-$(IPTABLES_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- LIGHTTPD_VER=1.4.31 $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz: $(WGET) http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(LIGHTTPD_VER).tar.gz $(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/lighttpd-$(LIGHTTPD_VER) $(UNTAR)/lighttpd-$(LIGHTTPD_VER).tar.gz - cd $(BUILD_TMP)/lighttpd-$(LIGHTTPD_VER) && \ - $(BUILDENV) ./configure \ - --build=$(BUILD) \ - --host=$(TARGET) \ - --prefix= \ - --mandir=/.remove \ - --docdir=/.remove \ - --infodir=/.remove \ - --with-zlib \ - --enable-silent-rules \ - --without-pcre \ - --without-bzip2 && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(TARGET_DIR) + $(CHDIR)/lighttpd-$(LIGHTTPD_VER); \ + $(BUILDENV) ./configure \ + --build=$(BUILD) \ + --host=$(TARGET) \ + --prefix= \ + --mandir=/.remove \ + --docdir=/.remove \ + --infodir=/.remove \ + --with-zlib \ + --enable-silent-rules \ + --without-pcre \ + --without-bzip2 \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/lighttpd-$(LIGHTTPD_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- PYTHON_VER=2.7.11 $(ARCHIVE)/Python-$(PYTHON_VER).tgz: @@ -120,10 +142,10 @@ $(ARCHIVE)/Python-$(PYTHON_VER).tgz: $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR) $(REMOVE)/Python-$(PYTHON_VER) $(UNTAR)/Python-$(PYTHON_VER).tgz - pushd $(BUILD_TMP)/Python-$(PYTHON_VER) && \ - echo "ac_cv_file__dev_ptmx=no" > config.site && \ - echo "ac_cv_file__dev_ptc=no" >> config.site && \ - export CONFIG_SITE=config.site && \ + $(CHDIR)/Python-$(PYTHON_VER); \ + echo "ac_cv_file__dev_ptmx=no" > config.site; \ + echo "ac_cv_file__dev_ptc=no" >> config.site; \ + export CONFIG_SITE=config.site; \ ./configure; \ make python Parser/pgen; \ mv python hostpython; \ @@ -140,7 +162,7 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR) --prefix= \ --enable-shared \ --disable-ipv6 \ - ; \ + ; \ make \ HOSTPYTHON=./hostpython \ HOSTPGEN=./Parser/hostpgen \ @@ -149,7 +171,7 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR) CROSS_COMPILE_TARGET=yes \ HOSTARCH=$(TARGET) \ BUILDARCH=$(BUILD) \ - ; \ + ; \ make install \ HOSTPYTHON=./hostpython \ HOSTPGEN=./Parser/hostpgen \ @@ -157,12 +179,15 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR) CROSS_COMPILE=$(TARGET)- \ CROSS_COMPILE_TARGET=yes \ prefix=$(BUILD_TMP)/Python-$(PYTHON_VER)/_install \ - ; \ + ; \ cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/python* $(TARGET_LIB_DIR)/ cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/libpython* $(TARGET_LIB_DIR)/ chmod +w $(TARGET_LIB_DIR)/libpython* install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGET_DIR)/bin/ $(REMOVE)/Python-$(PYTHON_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR) # workaround unrecognized command line options @@ -170,14 +195,13 @@ $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR) $(D)/astra-sm-no-march-cflags: $(REMOVE)/astra-sm - cd $(BUILD_TMP); \ - git clone https://gitlab.com/crazycat69/astra-sm.git astra-sm; \ - cd astra-sm; \ + git clone https://gitlab.com/crazycat69/astra-sm.git $(BUILD_TMP)/astra-sm; \ + $(CHDIR)/astra-sm; \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --without-lua-compiler \ - ; \ + ; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/astra-sm - touch $@ + $(TOUCH) diff --git a/make/system-tools.mk b/make/system-tools.mk index 99516d12..ff3cd32c 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -1,57 +1,67 @@ # makefile to build system tools +# ----------------------------------------------------------------------------- + $(D)/openvpn: $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/openvpn-$(OPENVPN_VER) $(UNTAR)/openvpn-$(OPENVPN_VER).tar.xz - cd $(BUILD_TMP)/openvpn-$(OPENVPN_VER) && \ - $(CONFIGURE) \ - IFCONFIG="/sbin/ifconfig" \ - NETSTAT="/bin/netstat" \ - ROUTE="/sbin/route" \ - IPROUTE="/sbin/ip" \ - --prefix= \ - --mandir=/.remove \ - --docdir=/.remove \ - --infodir=/.remove \ - --enable-shared \ - --disable-static \ - --enable-small \ - --enable-management \ - --disable-debug \ - --disable-selinux \ - --disable-plugins \ - --disable-pkcs11 && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(TARGET_DIR) + $(CHDIR)/openvpn-$(OPENVPN_VER); \ + $(CONFIGURE) \ + IFCONFIG="/sbin/ifconfig" \ + NETSTAT="/bin/netstat" \ + ROUTE="/sbin/route" \ + IPROUTE="/sbin/ip" \ + --prefix= \ + --mandir=/.remove \ + --docdir=/.remove \ + --infodir=/.remove \ + --enable-shared \ + --disable-static \ + --enable-small \ + --enable-management \ + --disable-debug \ + --disable-selinux \ + --disable-plugins \ + --disable-pkcs11 \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/openvpn-$(OPENVPN_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/openssh-$(OPENSSH_VER) $(UNTAR)/openssh-$(OPENSSH_VER).tar.gz - cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \ - export ac_cv_search_dlopen=no && \ - ./configure \ - $(CONFIGURE_OPTS) \ - --prefix= \ - --mandir=/.remove \ - --docdir=/.remove \ - --infodir=/.remove \ - --with-pid-dir=/tmp \ - --with-privsep-path=/var/empty \ - --with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \ - --with-ldflags="-L$(TARGET_LIB_DIR)" \ - --libexecdir=/bin \ - --disable-strip \ - --disable-lastlog \ - --disable-utmp \ - --disable-utmpx \ - --disable-wtmp \ - --disable-wtmpx \ - --disable-pututline \ - --disable-pututxline && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(TARGET_DIR) + $(CHDIR)/openssh-$(OPENSSH_VER); \ + export ac_cv_search_dlopen=no; \ + ./configure \ + $(CONFIGURE_OPTS) \ + --prefix= \ + --mandir=/.remove \ + --docdir=/.remove \ + --infodir=/.remove \ + --with-pid-dir=/tmp \ + --with-privsep-path=/var/empty \ + --with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \ + --with-ldflags="-L$(TARGET_LIB_DIR)" \ + --libexecdir=/bin \ + --disable-strip \ + --disable-lastlog \ + --disable-utmp \ + --disable-utmpx \ + --disable-wtmp \ + --disable-wtmpx \ + --disable-pututline \ + --disable-pututxline \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/openssh-$(OPENSSH_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- ifeq ($(BOXSERIES), hd2) LOC_TIME = var/etc/localtime @@ -63,7 +73,7 @@ $(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/timezone mkdir $(BUILD_TMP)/timezone $(BUILD_TMP)/timezone/zoneinfo tar -C $(BUILD_TMP)/timezone -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz - set -e; cd $(BUILD_TMP)/timezone; \ + $(CHDIR)/timezone; \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ zic -d zoneinfo.tmp \ africa antarctica asia australasia \ @@ -82,11 +92,14 @@ $(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGET_DIR) install -m 0644 $(IMAGEFILES)/timezone/timezone.xml $(TARGET_DIR)/etc/ cp $(TARGET_DIR)/share/zoneinfo/CET $(TARGET_DIR)/$(LOC_TIME) $(REMOVE)/timezone - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/mtd-utils-$(MTD-UTILS_VER) $(UNTAR)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 - pushd $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER) && \ + $(CHDIR)/mtd-utils-$(MTD-UTILS_VER); \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ @@ -94,37 +107,44 @@ $(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/mtd-utils-$(MTD-UTI --enable-silent-rules \ --disable-tests \ --without-xattr \ - && \ + ; \ $(MAKE) ifeq ($(BOXSERIES), hd2) - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nanddump $(TARGET_DIR)/sbin - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandtest $(TARGET_DIR)/sbin - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandwrite $(TARGET_DIR)/sbin - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mtd_debug $(TARGET_DIR)/sbin - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(TARGET_DIR)/sbin + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nanddump $(TARGET_DIR)/sbin + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandtest $(TARGET_DIR)/sbin + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandwrite $(TARGET_DIR)/sbin + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mtd_debug $(TARGET_DIR)/sbin + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(TARGET_DIR)/sbin endif - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/flash_erase $(TARGET_DIR)/sbin - $(REMOVE)/mtd-utils-$(MTD-UTILS_VER) - touch $@ + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/flash_erase $(TARGET_DIR)/sbin + $(REMOVE)/mtd-utils-$(MTD-UTILS_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/iperf: $(ARCHIVE)/iperf-$(IPERF_VER)-source.tar.gz | $(TARGET_DIR) + $(REMOVE)/iperf-$(IPERF_VER) $(UNTAR)/iperf-$(IPERF_VER)-source.tar.gz - pushd $(BUILD_TMP)/iperf-$(IPERF_VER); \ - $(PATCH)/iperf-disable-profiling.patch && \ + $(CHDIR)/iperf-$(IPERF_VER); \ + $(PATCH)/iperf-disable-profiling.patch; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ - --mandir=/.remove; \ + --mandir=/.remove \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/iperf-$(IPERF_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/parted-$(PARTED_VER) $(UNTAR)/parted-$(PARTED_VER).tar.xz - cd $(BUILD_TMP)/parted-$(PARTED_VER) && \ - $(PATCH)/parted-3.2-devmapper-1.patch && \ - $(PATCH)/parted-3.2-sysmacros.patch && \ + $(CHDIR)/parted-$(PARTED_VER); \ + $(PATCH)/parted-3.2-devmapper-1.patch; \ + $(PATCH)/parted-3.2-sysmacros.patch; \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ @@ -137,38 +157,48 @@ $(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGET_DI --disable-pc98 \ --disable-nls \ --disable-device-mapper \ - --without-readline && \ - $(MAKE) && \ + --without-readline \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL)/libparted.la $(REWRITE_LIBTOOL)/libparted-fs-resize.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libparted.pc $(REMOVE)/parted-$(PARTED_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/hdparm: $(ARCHIVE)/hdparm-$(HDPARM_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/hdparm-$(HDPARM_VER) $(UNTAR)/hdparm-$(HDPARM_VER).tar.gz - pushd $(BUILD_TMP)/hdparm-$(HDPARM_VER) && \ + $(CHDIR)/hdparm-$(HDPARM_VER); \ $(BUILDENV) \ - $(MAKE) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip && \ + $(MAKE) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip; \ install -D -m755 hdparm $(TARGET_DIR)/sbin/hdparm $(REMOVE)/hdparm-$(HDPARM_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/hd-idle: $(ARCHIVE)/hd-idle-$(HD-IDLE_VER).tgz | $(TARGET_DIR) + $(REMOVE)/hd-idle $(UNTAR)/hd-idle-$(HD-IDLE_VER).tgz - pushd $(BUILD_TMP)/hd-idle && \ - $(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o hd-idle hd-idle.c && \ - install -m755 hd-idle $(BIN)/ + $(CHDIR)/hd-idle; \ + $(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o hd-idle hd-idle.c; \ + install -m755 hd-idle $(BIN)/ $(REMOVE)/hd-idle - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # only used for "touch" $(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/coreutils-$(COREUTILS_VER) $(UNTAR)/coreutils-$(COREUTILS_VER).tar.xz - cd $(BUILD_TMP)/coreutils-$(COREUTILS_VER) && \ - $(PATCH)/coreutils-fix-coolstream-build.patch && \ - autoreconf -fi && \ + $(CHDIR)/coreutils-$(COREUTILS_VER); \ + $(PATCH)/coreutils-fix-coolstream-build.patch; \ + autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -177,112 +207,134 @@ $(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGET_DIR) --disable-libcap \ --disable-acl \ --without-gmp \ - --without-selinux && \ + --without-selinux \ + ; \ $(MAKE) install -m755 $(BUILD_TMP)/coreutils-$(COREUTILS_VER)/src/touch $(BIN)/ $(REMOVE)/coreutils-$(COREUTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/less: $(D)/libncurses $(ARCHIVE)/less-$(LESS_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/less-$(LESS_VER) $(UNTAR)/less-$(LESS_VER).tar.gz - cd $(BUILD_TMP)/less-$(LESS_VER) && \ + $(CHDIR)/less-$(LESS_VER); \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ --mandir=/.remove \ - && \ - $(MAKE) && \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/less-$(LESS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ntp: $(ARCHIVE)/ntp-$(NTP_VER).tar.gz $(D)/openssl | $(TARGET_DIR) + $(REMOVE)/ntp-$(NTP_VER) $(UNTAR)/ntp-$(NTP_VER).tar.gz - pushd $(BUILD_TMP)/ntp-$(NTP_VER) && \ + $(CHDIR)/ntp-$(NTP_VER); \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ --with-shared \ --with-crypto \ --with-yielding-select=yes \ - --without-ntpsnmpd && \ + --without-ntpsnmpd \ + ; \ $(MAKE) mv -v $(BUILD_TMP)/ntp-$(NTP_VER)/ntpdate/ntpdate $(TARGET_DIR)/sbin/ $(REMOVE)/ntp-$(NTP_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/djmount: $(ARCHIVE)/djmount-$(DJMOUNT_VER).tar.gz $(D)/libfuse | $(TARGET_DIR) + $(REMOVE)/djmount-$(DJMOUNT_VER) $(UNTAR)/djmount-$(DJMOUNT_VER).tar.gz - pushd $(BUILD_TMP)/djmount-$(DJMOUNT_VER) && \ - $(PATCH)/djmount-fix-hang-with-asset-upnp.patch && \ - $(PATCH)/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch && \ - $(PATCH)/djmount-fix-new-autotools.diff && \ - $(PATCH)/djmount-fixed-crash-when-using-UTF-8-charset.patch && \ - $(PATCH)/djmount-fixed-crash.patch && \ - $(PATCH)/djmount-support-fstab-mounting.diff && \ - $(PATCH)/djmount-support-seeking-in-large-2gb-files.patch && \ - touch libupnp/config.aux/config.rpath && \ - autoreconf -fi && \ + $(CHDIR)/djmount-$(DJMOUNT_VER); \ + $(PATCH)/djmount-fix-hang-with-asset-upnp.patch; \ + $(PATCH)/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch; \ + $(PATCH)/djmount-fix-new-autotools.diff; \ + $(PATCH)/djmount-fixed-crash-when-using-UTF-8-charset.patch; \ + $(PATCH)/djmount-fixed-crash.patch; \ + $(PATCH)/djmount-support-fstab-mounting.diff; \ + $(PATCH)/djmount-support-seeking-in-large-2gb-files.patch; \ + touch libupnp/config.aux/config.rpath; \ + autoreconf -fi; \ $(CONFIGURE) -C \ --prefix= \ - --disable-debug && \ - make && \ + --disable-debug \ + ; \ + make; \ make install DESTDIR=$(TARGET_DIR) install -D -m 755 $(IMAGEFILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount ln -sf djmount $(TARGET_DIR)/etc/init.d/S99djmount ln -sf djmount $(TARGET_DIR)/etc/init.d/K01djmount $(REMOVE)/djmount-$(DJMOUNT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGET_DIR) + $(REMOVE)/ushare-$(USHARE_VER) $(UNTAR)/ushare-$(USHARE_VER).tar.bz2 - pushd $(BUILD_TMP)/ushare-$(USHARE_VER) && \ - $(PATCH)/ushare.diff && \ - $(PATCH)/ushare-fix-building-with-gcc-5.x.patch && \ + $(CHDIR)/ushare-$(USHARE_VER); \ + $(PATCH)/ushare.diff; \ + $(PATCH)/ushare-fix-building-with-gcc-5.x.patch; \ $(BUILDENV) \ ./configure \ --prefix=$(TARGET_DIR) \ --disable-dlna \ --disable-nls \ --cross-compile \ - --cross-prefix=$(TARGET)- && \ - sed -i config.h -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@' && \ - sed -i config.h -e 's@LOCALEDIR.*@LOCALEDIR "/share"@' && \ - ln -sf ../config.h src/ && \ - $(MAKE) && \ - $(MAKE) install && \ + --cross-prefix=$(TARGET)- \ + ; \ + sed -i config.h -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@'; \ + sed -i config.h -e 's@LOCALEDIR.*@LOCALEDIR "/share"@'; \ + ln -sf ../config.h src/; \ + $(MAKE); \ + $(MAKE) install; \ install -D -m 0644 $(IMAGEFILES)/scripts/ushare.conf $(TARGET_DIR)/etc/ushare.conf install -D -m 0755 $(IMAGEFILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare ln -sf ushare $(TARGET_DIR)/etc/init.d/S99ushare ln -sf ushare $(TARGET_DIR)/etc/init.d/K01ushare $(REMOVE)/ushare-$(USHARE_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/smartmontools-$(SMARTMON_VER) $(UNTAR)/smartmontools-$(SMARTMON_VER).tar.gz - cd $(BUILD_TMP)/smartmontools-$(SMARTMON_VER) && \ + $(CHDIR)/smartmontools-$(SMARTMON_VER); \ $(BUILDENV) \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= && \ - $(MAKE) && \ + --prefix= \ + ; \ + $(MAKE); \ install -m755 smartctl $(TARGET_DIR)/sbin/smartctl $(REMOVE)/smartmontools-$(SMARTMON_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VER).tar.xz | $(TARGET_DIR) $(REMOVE)/inadyn-$(INADYN_VER) $(UNTAR)/inadyn-$(INADYN_VER).tar.xz - cd $(BUILD_TMP)/inadyn-$(INADYN_VER) && \ - autoreconf -fi && \ + $(CHDIR)/inadyn-$(INADYN_VER); \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --libdir=$(TARGET_LIB_DIR) \ --includedir=$(TARGET_INCLUDE_DIR) \ --mandir=/.remove \ --docdir=/.remove \ - --enable-openssl && \ + --enable-openssl \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) install -D -m 644 $(IMAGEFILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf @@ -291,16 +343,19 @@ $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VE ln -sf inadyn $(TARGET_DIR)/etc/init.d/S80inadyn ln -sf inadyn $(TARGET_DIR)/etc/init.d/K60inadyn $(REMOVE)/inadyn-$(INADYN_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/vsftpd-$(VSFTPD_VER) $(UNTAR)/vsftpd-$(VSFTPD_VER).tar.gz - cd $(BUILD_TMP)/vsftpd-$(VSFTPD_VER) && \ - $(PATCH)/vsftpd-fix-CVE-2015-1419.patch && \ - $(PATCH)/vsftpd-disable-capabilities.patch && \ - sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h && \ - sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h && \ - make clean && \ + $(CHDIR)/vsftpd-$(VSFTPD_VER); \ + $(PATCH)/vsftpd-fix-CVE-2015-1419.patch; \ + $(PATCH)/vsftpd-disable-capabilities.patch; \ + sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ + sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ + make clean; \ TARGET_DIR=$(TARGET_DIR) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" install -d $(TARGET_DIR)/share/empty install -D -m 755 $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/vsftpd $(TARGET_DIR)/sbin/vsftpd @@ -310,48 +365,62 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGET_DIR) ln -sf vsftpd $(TARGET_DIR)/etc/init.d/S53vsftpd ln -sf vsftpd $(TARGET_DIR)/etc/init.d/K80vsftpd $(REMOVE)/vsftpd-$(VSFTPD_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/procps-ng-$(PROCPS-NG_VER) $(UNTAR)/procps-ng-$(PROCPS-NG_VER).tar.xz - cd $(BUILD_TMP)/procps-ng-$(PROCPS-NG_VER) && \ - export ac_cv_func_malloc_0_nonnull=yes && \ - export ac_cv_func_realloc_0_nonnull=yes && \ + $(CHDIR)/procps-ng-$(PROCPS-NG_VER); \ + export ac_cv_func_malloc_0_nonnull=yes; \ + export ac_cv_func_realloc_0_nonnull=yes; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= && \ - $(MAKE) && \ - rm -f $(TARGET_DIR)/bin/ps $(TARGET_DIR)/bin/top && \ - install -D -m 755 top/.libs/top $(TARGET_DIR)/bin/top && \ - install -D -m 755 ps/.libs/pscommand $(TARGET_DIR)/bin/ps && \ + --prefix= \ + ; \ + $(MAKE); \ + rm -f $(TARGET_DIR)/bin/ps $(TARGET_DIR)/bin/top; \ + install -D -m 755 top/.libs/top $(TARGET_DIR)/bin/top; \ + install -D -m 755 ps/.libs/pscommand $(TARGET_DIR)/bin/ps; \ cp -a proc/.libs/libprocps.so* $(TARGET_LIB_DIR) $(REMOVE)/procps-ng-$(PROCPS-NG_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/nano-$(NANO_VER) $(UNTAR)/nano-$(NANO_VER).tar.gz - cd $(BUILD_TMP)/nano-$(NANO_VER) && \ - export ac_cv_prog_NCURSESW_CONFIG=false && \ + $(CHDIR)/nano-$(NANO_VER); \ + export ac_cv_prog_NCURSESW_CONFIG=false; \ $(CONFIGURE) \ --target=$(TARGET) \ - --prefix= && \ - $(MAKE) CURSES_LIB="-lncurses" && \ + --prefix= \ + ; \ + $(MAKE) CURSES_LIB="-lncurses"; \ install -m755 src/nano $(TARGET_DIR)/bin $(REMOVE)/nano-$(NANO_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/minicom-$(MINICOM_VER) $(UNTAR)/minicom-$(MINICOM_VER).tar.gz - cd $(BUILD_TMP)/minicom-$(MINICOM_VER) && \ - $(PATCH)/minicom-fix-h-v-return-value-is-not-0.patch && \ + $(CHDIR)/minicom-$(MINICOM_VER); \ + $(PATCH)/minicom-fix-h-v-return-value-is-not-0.patch; \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ - --disable-nls && \ - $(MAKE) && \ + --disable-nls \ + ; \ + $(MAKE); \ install -m755 src/minicom $(TARGET_DIR)/bin $(REMOVE)/minicom-$(MINICOM_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # Link against libtirpc so that we can leverage its RPC # support for NFS mounting with BusyBox @@ -384,30 +453,35 @@ BUSYBOX_PATCH += busybox-fix-partition-size.patch $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) $(REMOVE)/busybox-$(BUSYBOX_VER) $(UNTAR)/$(BUSYBOX_SOURCE) - pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ - $(call apply_patches, $(BUSYBOX_PATCH)) && \ - cp $(CONFIGS)/busybox-$(BOXSERIES).config .config && \ - sed -i -e 's|^CONFIG_PREFIX=.*|CONFIG_PREFIX="$(TARGET_DIR)"|' .config && \ - $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ + $(CHDIR)/busybox-$(BUSYBOX_VER); \ + $(call apply_patches, $(BUSYBOX_PATCH)); \ + cp $(CONFIGS)/busybox-$(BOXSERIES).config .config; \ + sed -i -e 's|^CONFIG_PREFIX=.*|CONFIG_PREFIX="$(TARGET_DIR)"|' .config; \ + $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS); \ $(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS) $(REMOVE)/busybox-$(BUSYBOX_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/bash-$(BASH_VER) $(UNTAR)/bash-$(BASH_VER).tar.gz - cd $(BUILD_TMP)/bash-$(BASH_VER); \ - $(call apply_patches, $(PATCHES)/bash-$(BASH_MAJOR).$(BASH_MINOR), 0) && \ - $(CONFIGURE) && \ - $(MAKE) && \ + $(CHDIR)/bash-$(BASH_VER); \ + $(call apply_patches, $(PATCHES)/bash-$(BASH_MAJOR).$(BASH_MINOR), 0); \ + $(CONFIGURE); \ + $(MAKE); \ install -m 755 bash $(TARGET_DIR)/bin $(REMOVE)/bash-$(BASH_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz - cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \ - autoreconf -fi && \ + $(CHDIR)/e2fsprogs-$(E2FSPROGS_VER); \ + autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=/ \ @@ -426,20 +500,24 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGET_DIR) --enable-fsck \ --enable-symlink-install \ --enable-symlink-build \ - --with-gnu-ld && \ - $(MAKE) && \ - $(MAKE) install DESTDIR=$(TARGET_DIR) && \ - cd lib/uuid/ && \ + --with-gnu-ld \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR); \ + cd lib/uuid/; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) cd $(TARGET_DIR) && rm sbin/dumpe2fs sbin/logsave sbin/e2undo \ sbin/filefrag sbin/e2freefrag bin/chattr bin/lsattr bin/uuidgen - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGET_DIR) + $(REMOVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER) $(UNTAR)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz - cd $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER) && \ + $(CHDIR)/ntfs-3g_ntfsprogs-$(NTFS3G_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -447,11 +525,11 @@ $(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGET_DIR) --disable-ntfsprogs \ --disable-ldconfig \ --disable-library \ - && \ - $(MAKE) && \ + ; \ + $(MAKE); \ install -m 755 $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER)/src/ntfs-3g $(TARGET_DIR)/sbin/ntfs-3g $(REMOVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER) - touch $@ + $(TOUCH) # ----------------------------------------------------------------------------- @@ -464,13 +542,13 @@ AUTOFS_PATCH = $(addprefix autofs-$(AUTOFS5_VER)/, $(shell cat $(PATCHES)/autofs $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/autofs-$(AUTOFS5_VER) $(UNTAR)/autofs-$(AUTOFS5_VER).tar.gz - cd $(BUILD_TMP)/autofs-$(AUTOFS5_VER) && \ - $(call apply_patches, $(AUTOFS_PATCH)) && \ - export ac_cv_linux_procfs=yes && \ - export ac_cv_path_KRB5_CONFIG=no && \ - export ac_cv_path_MODPROBE=/sbin/modprobe && \ - export ac_cv_path_RANLIB=$(TARGET)-ranlib && \ - autoreconf -fi && \ + $(CHDIR)/autofs-$(AUTOFS5_VER); \ + $(call apply_patches, $(AUTOFS_PATCH)); \ + export ac_cv_linux_procfs=yes; \ + export ac_cv_path_KRB5_CONFIG=no; \ + export ac_cv_path_MODPROBE=/sbin/modprobe; \ + export ac_cv_path_RANLIB=$(TARGET)-ranlib; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ @@ -485,28 +563,29 @@ $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGET_D --with-mapdir=/etc \ --with-fifodir=/var/run \ --with-flagdir=/var/run \ - && \ - sed -i "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h && \ - $(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1 && \ + ; \ + sed -i "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ + $(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1; \ $(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGET_DIR) cp -a $(IMAGEFILES)/autofs/* $(TARGET_DIR)/ ln -sf autofs $(TARGET_DIR)/etc/init.d/S60autofs ln -sf autofs $(TARGET_DIR)/etc/init.d/K40autofs $(REMOVE)/autofs-$(AUTOFS5_VER) - touch $@ + $(TOUCH) # ----------------------------------------------------------------------------- samba: samba-$(BOXSERIES) $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/samba-$(SAMBA33_VER) $(UNTAR)/samba-$(SAMBA33_VER).tar.gz - cd $(BUILD_TMP)/samba-$(SAMBA33_VER) && \ - $(PATCH)/samba33-build-only-what-we-need.patch && \ - $(PATCH)/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch - cd $(BUILD_TMP)/samba-$(SAMBA33_VER)/source && \ - ./autogen.sh && \ - export CONFIG_SITE=$(CONFIGS)/samba33-config.site && \ + $(CHDIR)/samba-$(SAMBA33_VER); \ + $(PATCH)/samba33-build-only-what-we-need.patch; \ + $(PATCH)/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch + $(CHDIR)/samba-$(SAMBA33_VER)/source; \ + ./autogen.sh; \ + export CONFIG_SITE=$(CONFIGS)/samba33-config.site; \ $(CONFIGURE) \ --prefix=/ \ --datadir=/var/samba \ @@ -541,8 +620,9 @@ $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGET_DIR) --disable-iprint \ --disable-pie \ --disable-relro \ - --disable-swat && \ - $(MAKE) all && \ + --disable-swat \ + ; \ + $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_DIR)/var/samba/locks install $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf @@ -555,25 +635,28 @@ $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/smbclient rm -rf $(TARGET_DIR)/bin/smbpasswd $(REMOVE)/samba-$(SAMBA33_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/samba-hd51 \ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/samba-$(SAMBA36_VER) $(UNTAR)/samba-$(SAMBA36_VER).tar.gz - cd $(BUILD_TMP)/samba-$(SAMBA36_VER) && \ - $(PATCH)/samba36-build-only-what-we-need.patch && \ - $(PATCH)/samba36-remove_printer_support.patch && \ - $(PATCH)/samba36-remove_ad_support.patch && \ - $(PATCH)/samba36-remove_services.patch && \ - $(PATCH)/samba36-remove_winreg_support.patch && \ - $(PATCH)/samba36-remove_registry_backend.patch && \ - $(PATCH)/samba36-strip_srvsvc.patch && \ - patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2016-2112-v3-6.patch && \ - patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2016-2115-v3-6.patch && \ - patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2017-7494-v3-6.patch - cd $(BUILD_TMP)/samba-$(SAMBA36_VER)/source3 && \ - ./autogen.sh && \ - export CONFIG_SITE=$(CONFIGS)/samba36-config.site && \ + $(CHDIR)/samba-$(SAMBA36_VER); \ + $(PATCH)/samba36-build-only-what-we-need.patch; \ + $(PATCH)/samba36-remove_printer_support.patch; \ + $(PATCH)/samba36-remove_ad_support.patch; \ + $(PATCH)/samba36-remove_services.patch; \ + $(PATCH)/samba36-remove_winreg_support.patch; \ + $(PATCH)/samba36-remove_registry_backend.patch; \ + $(PATCH)/samba36-strip_srvsvc.patch; \ + patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2016-2112-v3-6.patch; \ + patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2016-2115-v3-6.patch; \ + patch -p0 -i $(BASE_DIR)/archive-patches/samba36-CVE-2017-7494-v3-6.patch + $(CHDIR)/samba-$(SAMBA36_VER)/source3; \ + ./autogen.sh; \ + export CONFIG_SITE=$(CONFIGS)/samba36-config.site; \ $(CONFIGURE) \ --prefix=/ \ --datadir=/var/samba \ @@ -606,8 +689,9 @@ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGET_DIR) --disable-iprint \ --disable-pie \ --disable-relro \ - --disable-swat && \ - $(MAKE) all && \ + --disable-swat \ + ; \ + $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_DIR)/var/samba/locks install $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf @@ -620,12 +704,14 @@ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/smbclient rm -rf $(TARGET_DIR)/bin/smbpasswd $(REMOVE)/samba-$(SAMBA36_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGET_DIR) $(REMOVE)/dropbear-$(DROPBEAR_VER) $(UNTAR)/dropbear-$(DROPBEAR_VER).tar.bz2 - cd $(BUILD_TMP)/dropbear-$(DROPBEAR_VER) && \ + $(CHDIR)/dropbear-$(DROPBEAR_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -637,55 +723,63 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGET_ --disable-zlib \ --disable-harden \ --enable-bundled-libtom \ - && \ - # Ensure that dropbear doesn't use crypt() when it's not available && \ - echo '#if !HAVE_CRYPT' >> localoptions.h && \ - echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h && \ - echo '#endif' >> localoptions.h && \ - # disable SMALL_CODE define && \ - sed -i 's|^\(#define DROPBEAR_SMALL_CODE\).*|\1 0|' default_options.h && \ - # fix PATH define && \ - sed -i 's|^\(#define DEFAULT_PATH\).*|\1 "/sbin:/bin:/var/bin"|' default_options.h && \ - # remove /usr prefix && \ - sed -i 's|/usr/|/|g' default_options.h && \ - $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1 && \ + ; \ + # Ensure that dropbear doesn't use crypt() when it's not available; \ + echo '#if !HAVE_CRYPT' >> localoptions.h; \ + echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h; \ + echo '#endif' >> localoptions.h; \ + # disable SMALL_CODE define; \ + sed -i 's|^\(#define DROPBEAR_SMALL_CODE\).*|\1 0|' default_options.h; \ + # fix PATH define; \ + sed -i 's|^\(#define DEFAULT_PATH\).*|\1 "/sbin:/bin:/var/bin"|' default_options.h; \ + # remove /usr prefix; \ + sed -i 's|/usr/|/|g' default_options.h; \ + $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \ $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR) install -D -m 0755 $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear install -d -m 0755 $(TARGET_DIR)/etc/dropbear ln -sf dropbear $(TARGET_DIR)/etc/init.d/S60dropbear ln -sf dropbear $(TARGET_DIR)/etc/init.d/K60dropbear $(REMOVE)/dropbear-$(DROPBEAR_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/sg3-utils: $(ARCHIVE)/sg3_utils-$(SG3-UTILS_VER).tar.xz | $(TARGET_DIR) + $(REMOVE)/sg3_utils-$(SG3-UTILS_VER) $(UNTAR)/sg3_utils-$(SG3-UTILS_VER).tar.xz - cd $(BUILD_TMP)/sg3_utils-$(SG3-UTILS_VER) && \ + $(CHDIR)/sg3_utils-$(SG3-UTILS_VER); \ $(CONFIGURE) \ --prefix= \ - --mandir=/.remove && \ - $(MAKE) && \ - cp -a src/.libs/sg_start $(TARGET_DIR)/bin && \ - cp -a lib/.libs/libsgutils2.so.2.0.0 $(TARGET_LIB_DIR) && \ - cp -a lib/.libs/libsgutils2.so.2 $(TARGET_LIB_DIR) && \ + --mandir=/.remove \ + ; \ + $(MAKE); \ + cp -a src/.libs/sg_start $(TARGET_DIR)/bin; \ + cp -a lib/.libs/libsgutils2.so.2.0.0 $(TARGET_LIB_DIR); \ + cp -a lib/.libs/libsgutils2.so.2 $(TARGET_LIB_DIR); \ cp -a lib/.libs/libsgutils2.so $(TARGET_LIB_DIR) $(REMOVE)/sg3_utils-$(SG3-UTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- fbshot: $(TARGET_DIR)/bin/fbshot $(TARGET_DIR)/bin/fbshot: $(D)/libpng $(ARCHIVE)/fbshot-$(FBSHOT_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/fbshot-$(FBSHOT_VER) $(UNTAR)/fbshot-$(FBSHOT_VER).tar.gz - cd $(BUILD_TMP)/fbshot-$(FBSHOT_VER); \ + $(CHDIR)/fbshot-$(FBSHOT_VER); \ $(PATCH)/fbshot-32bit_cs_fb.diff; \ $(PATCH)/fbshot_cs_hd2.diff; \ $(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) fbshot.c -lpng -lz -o $@ $(REMOVE)/fbshot-$(FBSHOT_VER) +# ----------------------------------------------------------------------------- + $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR) $(REMOVE)/lcd4linux git clone https://github.com/TangoCash/lcd4linux.git $(BUILD_TMP)/lcd4linux - cd $(BUILD_TMP)/lcd4linux && \ - ./bootstrap && \ + $(CHDIR)/lcd4linux; \ + ./bootstrap; \ $(CONFIGURE) \ --libdir=$(TARGET_LIB_DIR) \ --includedir=$(TARGET_INCLUDE_DIR) \ @@ -696,39 +790,45 @@ $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR) --infodir=/.remove \ --with-ncurses=$(TARGET_LIB_DIR) \ --with-drivers='DPF, SamsungSPF' \ - --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' && \ - $(MAKE) vcs_version && \ - $(MAKE) all && \ + --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' \ + ; \ + $(MAKE) vcs_version; \ + $(MAKE) all; \ $(MAKE) install $(REMOVE)/lcd4linux - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-$(WPA_SUPP_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/wpa_supplicant-$(WPA_SUPP_VER) $(UNTAR)/wpa_supplicant-$(WPA_SUPP_VER).tar.gz - pushd $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant && \ - cp $(CONFIGS)/wpa_supplicant.config .config && \ + $(CHDIR)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant; \ + cp $(CONFIGS)/wpa_supplicant.config .config; \ CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS)" CXXFLAGS="$(TARGET_CXXFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \ $(MAKE) cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_cli $(TARGET_DIR)/sbin/wpa_cli cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_passphrase $(TARGET_DIR)/sbin/wpa_passphrase cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_supplicant $(TARGET_DIR)/sbin/wpa_supplicant $(REMOVE)/wpa_supplicant-$(WPA_SUPP_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR) $(REMOVE)/xupnpd git clone https://github.com/clark15b/xupnpd.git $(BUILD_TMP)/xupnpd - pushd $(BUILD_TMP)/xupnpd && \ - $(PATCH)/xupnpd-coolstream-dynamic-lua.patch && \ - $(PATCH)/xupnpd-fix-memleak-on-coolstream-boxes-thanks-ng777.patch && \ - $(PATCH)/xupnpd-fix-webif-backlinks.diff && \ - $(PATCH)/xupnpd-change-XUPNPDROOTDIR.diff && \ + $(CHDIR)/xupnpd; \ + $(PATCH)/xupnpd-coolstream-dynamic-lua.patch; \ + $(PATCH)/xupnpd-fix-memleak-on-coolstream-boxes-thanks-ng777.patch; \ + $(PATCH)/xupnpd-fix-webif-backlinks.diff; \ + $(PATCH)/xupnpd-change-XUPNPDROOTDIR.diff; \ $(PATCH)/xupnpd-add-configuration-files.diff - pushd $(BUILD_TMP)/xupnpd/src && \ + $(CHDIR)/xupnpd/src; \ $(BUILDENV) \ - $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)" && \ - install -D -m 0755 xupnpd $(BIN)/ && \ - mkdir -p $(TARGET_DIR)/share/xupnpd/config && \ + $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \ + install -D -m 0755 xupnpd $(BIN)/; \ + mkdir -p $(TARGET_DIR)/share/xupnpd/config; \ for object in *.lua plugins/ profiles/ ui/ www/; do \ cp -a $$object $(TARGET_DIR)/share/xupnpd/; \ done; @@ -743,14 +843,16 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR) ln -sf xupnpd $(TARGET_DIR)/etc/init.d/K01xupnpd cp -a $(IMAGEFILES)/xupnpd/* $(TARGET_DIR)/ $(REMOVE)/xupnpd - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(TARGET_DIR) $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER) $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz - set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \ + $(CHDIR)/dosfstools-$(DOSFSTOOLS_VER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -759,11 +861,13 @@ $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar. --without-udev \ --enable-compat-symlinks \ CFLAGS="$(DOSFSTOOLS_CFLAGS)" \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- NFS-UTILS_IPV6=--enable-ipv6 ifeq ($(BOXSERIES), hd1) @@ -771,15 +875,16 @@ ifeq ($(BOXSERIES), hd1) endif $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/nfs-utils-$(NFS-UTILS_VER) $(UNTAR)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 - pushd $(BUILD_TMP)/nfs-utils-$(NFS-UTILS_VER) && \ - $(PATCH)/nfs-utils_01-Patch-taken-from-Gentoo.patch && \ - $(PATCH)/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch && \ - $(PATCH)/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch && \ - $(PATCH)/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch && \ - $(PATCH)/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch && \ - export knfsd_cv_bsd_signals=no && \ - autoreconf -fi && \ + $(CHDIR)/nfs-utils-$(NFS-UTILS_VER); \ + $(PATCH)/nfs-utils_01-Patch-taken-from-Gentoo.patch; \ + $(PATCH)/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch; \ + $(PATCH)/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch; \ + $(PATCH)/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch; \ + $(PATCH)/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch; \ + export knfsd_cv_bsd_signals=no; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --target=$(TARGET) \ @@ -796,7 +901,7 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(T --with-rpcgen=internal \ --without-systemd \ ; \ - $(MAKE) && \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) chmod 755 $(TARGET_DIR)/sbin/mount.nfs rm -rf $(TARGET_DIR)/sbin/mountstats @@ -811,33 +916,39 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(T ln -s nfsd $(TARGET_DIR)/etc/init.d/S60nfsd ln -s nfsd $(TARGET_DIR)/etc/init.d/K01nfsd $(REMOVE)/nfs-utils-$(NFS-UTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET_DIR) + $(REMOVE)/rpcbind-$(RPCBIND_VER) $(UNTAR)/rpcbind-$(RPCBIND_VER).tar.bz2 - cd $(BUILD_TMP)/rpcbind-$(RPCBIND_VER) && \ - $(PATCH)/rpcbind-0001-Remove-yellow-pages-support.patch && \ - autoreconf -fi && \ + $(CHDIR)/rpcbind-$(RPCBIND_VER); \ + $(PATCH)/rpcbind-0001-Remove-yellow-pages-support.patch; \ + autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ --enable-silent-rules \ --with-rpcuser=root \ --with-systemdsystemunitdir=no \ - --mandir=/.remove && \ - $(MAKE) && \ + --mandir=/.remove \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) ifeq ($(BOXSERIES), hd1) - sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_DIR)/etc/netconfig + sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_DIR)/etc/netconfig endif rm -rf $(TARGET_DIR)/bin/rpcgen $(REMOVE)/rpcbind-$(RPCBIND_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $(TARGET_DIR) $(REMOVE)/fuse-exfat-$(FUSE_EXFAT_VER) $(UNTAR)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz - pushd $(BUILD_TMP)/fuse-exfat-$(FUSE_EXFAT_VER); \ + $(CHDIR)/fuse-exfat-$(FUSE_EXFAT_VER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -847,12 +958,14 @@ $(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/fuse-exfat-$(FUSE_EXFAT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exfat | $(TARGET_DIR) $(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER) $(UNTAR)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz - pushd $(BUILD_TMP)/exfat-utils-$(EXFAT_UTILS_VER); \ + $(CHDIR)/exfat-utils-$(EXFAT_UTILS_VER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -862,12 +975,14 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exf $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR) $(REMOVE)/$(NI_STREAMRIPPER) tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x - pushd $(BUILD_TMP)/$(NI_STREAMRIPPER); \ + $(CHDIR)/$(NI_STREAMRIPPER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -880,11 +995,14 @@ $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) install -m755 $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/ $(REMOVE)/$(NI_STREAMRIPPER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGET_DIR) + $(REMOVE)/gettext-$(GETTEXT_VERSION) $(UNTAR)/gettext-$(GETTEXT_VERSION).tar.xz - pushd $(BUILD_TMP)/gettext-$(GETTEXT_VERSION)/gettext-runtime; \ + $(CHDIR)/gettext-$(GETTEXT_VERSION)/gettext-runtime; \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -906,12 +1024,14 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/ngettext $(REWRITE_LIBTOOL)/libintl.la $(REMOVE)/gettext-$(GETTEXT_VERSION) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET_DIR) $(REMOVE)/mc-$(MC_VER) $(UNTAR)/mc-$(MC_VER).tar.xz - pushd $(BUILD_TMP)/mc-$(MC_VER); \ + $(CHDIR)/mc-$(MC_VER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -928,21 +1048,23 @@ $(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET --with-screen=ncurses \ --without-diff-viewer \ --without-x \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_DIR)/share/mc/examples find $(TARGET_DIR)/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm $(REMOVE)/mc-$(MC_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/wget-$(WGET_VER) $(UNTAR)/wget-$(WGET_VER).tar.gz - cd $(BUILD_TMP)/wget-$(WGET_VER) && \ - $(PATCH)/wget-remove-hardcoded-engine-support-for-openss.patch && \ - $(PATCH)/wget-set-check_cert-false-by-default.patch && \ - $(PATCH)/wget-change_DEFAULT_LOGFILE.patch && \ + $(CHDIR)/wget-$(WGET_VER); \ + $(PATCH)/wget-remove-hardcoded-engine-support-for-openss.patch; \ + $(PATCH)/wget-set-check_cert-false-by-default.patch; \ + $(PATCH)/wget-change_DEFAULT_LOGFILE.patch; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -953,49 +1075,56 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGET_DIR) --with-gnu-ld \ --with-ssl=openssl \ --disable-debug \ - && \ - $(MAKE) && \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/wget-$(WGET_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- # builds only stripped down iconv binary # used for smarthomeinfo plugin $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGET_DIR) + $(REMOVE)/libiconv-$(LIBICONV_VER) $(UNTAR)/libiconv-$(LIBICONV_VER).tar.gz - pushd $(BUILD_TMP)/libiconv-$(LIBICONV_VER) && \ - $(PATCH)/iconv-disable_transliterations.patch && \ - $(PATCH)/iconv-strip_charsets.patch && \ + $(CHDIR)/libiconv-$(LIBICONV_VER); \ + $(PATCH)/iconv-disable_transliterations.patch; \ + $(PATCH)/iconv-strip_charsets.patch; \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ --enable-static \ --disable-shared \ --enable-relocatable \ - --datarootdir=/.remove && \ - $(MAKE) && \ + --datarootdir=/.remove \ + ; \ + $(MAKE); \ $(MAKE) install DESTDIR=$(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp cp -a $(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp/bin/iconv $(TARGET_DIR)/bin $(REMOVE)/libiconv-$(LIBICONV_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR) $(REMOVE)/$(NI_OFGWRITE) tar -C $(SOURCE_DIR) -cp $(NI_OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x - cd $(BUILD_TMP)/$(NI_OFGWRITE); \ + $(CHDIR)/$(NI_OFGWRITE); \ $(BUILDENV) \ - $(MAKE) && \ + $(MAKE) install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_tgz $(TARGET_DIR)/bin install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite $(TARGET_DIR)/bin $(REMOVE)/$(NI_OFGWRITE) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR) $(REMOVE)/aio-grab - cd $(BUILD_TMP); \ - git clone git://github.com/oe-alliance/aio-grab.git aio-grab; \ - cd aio-grab; \ + git clone git://github.com/oe-alliance/aio-grab.git $(BUILD_TMP)/aio-grab; \ + $(CHDIR)/aio-grab; \ aclocal --force -I m4; \ libtoolize --copy --ltdl --force; \ autoconf --force; \ @@ -1004,66 +1133,75 @@ $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR) --target=$(TARGET) \ --prefix= \ --enable-silent-rules \ - ; \ + ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/aio-grab - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/dvbsnoop: | $(TARGET_DIR) $(REMOVE)/dvbsnoop - cd $(BUILD_TMP); \ - git clone https://github.com/Duckbox-Developers/dvbsnoop.git dvbsnoop; \ - cd dvbsnoop; \ + git clone https://github.com/Duckbox-Developers/dvbsnoop.git $(BUILD_TMP)/dvbsnoop; \ + $(CHDIR)/dvbsnoop; \ $(CONFIGURE) \ --enable-silent-rules \ --prefix= \ --mandir=/.remove \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/dvbsnoop - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) $(REMOVE)/ethtool-$(ETHTOOL_VER) $(UNTAR)/$(ETHTOOL_SOURCE) - set -e; cd $(BUILD_TMP)/ethtool-$(ETHTOOL_VER); \ + $(CHDIR)/ethtool-$(ETHTOOL_VER); \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ --libdir=$(TARGET_LIB_DIR) \ --disable-pretty-dump \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/ethtool-$(ETHTOOL_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) $(REMOVE)/gptfdisk-$(GPTFDISK_VER) $(UNTAR)/$(GPTFDISK_SOURCE) - cd $(BUILD_TMP)/gptfdisk-$(GPTFDISK_VER); \ + $(CHDIR)/gptfdisk-$(GPTFDISK_VER); \ sed -i 's|^CC=.*|CC=$(TARGET)-gcc|' Makefile; \ sed -i 's|^CXX=.*|CXX=$(TARGET)-g++|' Makefile; \ $(BUILDENV) \ $(MAKE) sgdisk; \ - install -m 755 -D sgdisk $(TARGET_DIR)/sbin/ - #$(REMOVE)/gptfdisk-$(GPTFDISK_VER) - touch $@ + install -m 755 -D sgdisk $(TARGET_DIR)/sbin/ + $(REMOVE)/gptfdisk-$(GPTFDISK_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR) $(REMOVE)/popt-$(POPT_VER) $(UNTAR)/$(POPT_SOURCE) - set -e; cd $(BUILD_TMP)/popt-$(POPT_VER); \ + $(CHDIR)/popt-$(POPT_VER); \ $(CONFIGURE) \ --prefix= \ - ; \ + ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/popt-$(POPT_VER) - touch $@ + $(TOUCH) + +# ----------------------------------------------------------------------------- $(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGET_DIR) install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGET_DIR)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) - touch $@ + $(TOUCH)