@@ -33,19 +33,14 @@ define Host/Install
# remove old automake resources to avoid version conflicts
rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*
rm -rf $(STAGING_DIR_HOST)/share/automake-[0-9]*
- $(MAKE) -C $(HOST_BUILD_DIR) install
- mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
- $(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
- ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
- ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
- ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
- ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.6
- ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15
-endef
-
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
+ $(call Host/Install/Default,$(1),)
+ mv $(1)/bin/aclocal $(1)/bin/aclocal.real
+ $(INSTALL_BIN) ./files/aclocal $(1)/bin/
+ ln -sf aclocal $(1)/bin/aclocal-1.9
+ ln -sf aclocal $(1)/bin/aclocal-1.10
+ ln -sf aclocal $(1)/bin/aclocal-1.11
+ ln -sf aclocal $(1)/bin/aclocal-1.11.6
+ ln -sf aclocal $(1)/bin/aclocal-1.15
endef
$(eval $(call HostBuild))
@@ -33,18 +33,11 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/fwcutter/b43-fwcutter $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm.bin $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) ./files/b43-fwsquash.py $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/b43-fwcutter
- rm -f $(STAGING_DIR_HOST)/bin/b43-asm
- rm -f $(STAGING_DIR_HOST)/bin/b43-asm.bin
- rm -f $(STAGING_DIR_HOST)/bin/b43-fwsquash.py
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/fwcutter/b43-fwcutter $(1)/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm $(1)/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm.bin $(1)/bin/
+ $(INSTALL_BIN) ./files/b43-fwsquash.py $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -19,14 +19,9 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += --enable-threads=pth
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
-endef
-
define Host/Install
- $(call Host/Install/Default)
- $(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc
+ $(call Host/Install/Default,$(1),)
+ $(INSTALL_BIN) ./scripts/yacc $(1)/bin/yacc
endef
$(eval $(call HostBuild))
@@ -20,13 +20,9 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/$(PKG_NAME)
+ $(INSTALL_DIR) $(1)/share/$(PKG_NAME)
$(CP) $(HOST_BUILD_DIR)/* \
- $(STAGING_DIR_HOST)/share/$(PKG_NAME)
-endef
-
-define Host/Clean
- rm -fR $(STAGING_DIR_HOST)/share/$(PKG_NAME)
+ $(1)/share/$(PKG_NAME)/
endef
$(eval $(call HostBuild))
@@ -23,9 +23,4 @@ define Host/Configure
$(call Host/Configure/Default)
endef
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/$(PKG_NAME) \
- $(STAGING_DIR_HOST)/share/man/man1/$(PKG_NAME).1
-endef
-
$(eval $(call HostBuild))
@@ -19,17 +19,13 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)"
define Host/Install/ccache
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
- $(CP) ./files/* $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/bin/
+ $(CP) ./files/* $(1)/bin/
endef
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
-endef
define Host/Install
- $(call Host/Install/Default)
- $(call Host/Install/ccache)
+ $(call Host/Install/Default,$(1),)
+ $(call Host/Install/ccache,$(1))
endef
$(eval $(call HostBuild))
@@ -37,17 +37,13 @@ define Host/Prepare
endef
define Host/Install
- $(Host/Install/Default)
- $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
- mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
- $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
- rm -rf $(STAGING_DIR_HOST)/include/uuid
- $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/e2fsck
- rm -f $(STAGING_DIR_HOST)/bin/tune2fs
+ $(call Host/Install/Default,$(1),)
+ $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid $(HOST_MAKE_INSTALL_FLAGS) install
+ $(CP) $(HOST_INSTALL_DIR)/$(HOST_BUILD_PREFIX)/* $(1)/
+ mkdir -p $(1)/include/e2fsprogs
+ $(CP) $(1)/include/uuid $(1)/include/e2fsprogs/
+ rm -rf $(1)/include/uuid
+ $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(1)/lib/
endef
$(eval $(call HostBuild))
@@ -20,7 +20,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/bld/linux/elftosb $(STAGING_DIR_HOST)/bin/elftosb
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/bld/linux/elftosb $(1)/bin/elftosb
endef
$(eval $(call HostBuild))
@@ -22,8 +22,4 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += \
--without-docbook
-define Host/Install
- $(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
$(eval $(call HostBuild))
@@ -89,7 +89,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/* $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -22,13 +22,8 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += --disable-shared
define Host/Install
- $(call Host/Install/Default)
- $(LN) flex $(STAGING_DIR_HOST)/bin/lex
-endef
-
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
+ $(call Host/Install/Default,$(1),)
+ $(LN) flex $(1)/bin/lex
endef
$(eval $(call HostBuild))
@@ -19,7 +19,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -41,11 +41,8 @@ define Host/Compile
endef
define Host/Install
- install -m0755 $(HOST_BUILD_DIR)/genext2fs $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/genext2fs
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/genext2fs $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -20,11 +20,8 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/gengetopt $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/gengetopt
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/gengetopt $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -19,11 +19,8 @@ PKG_HASH:=33ca413403a3341af0c9a8e6d9bb58f4ad080a5339e8a8729b83637d35bfaf1b
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/kernel2minor $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/kernel2minor
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/kernel2minor $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -37,16 +37,10 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include/libelf}
+ $(INSTALL_DIR) $(1)/{lib,include/libelf}
$(CP) $(HOST_BUILD_DIR)/lib/{elf_repl.h,gelf.h,libelf.h,nlist.h,sys_elf.h} \
- $(STAGING_DIR_HOST)/include/libelf/
- $(CP) $(HOST_BUILD_DIR)/lib/libelf.a $(STAGING_DIR_HOST)/lib/
-endef
-
-define Host/Clean
- rm -rf $(STAGING_DIR_HOST)/include/libelf
- rm -f $(STAGING_DIR_HOST)/lib/libelf.a
- $(call Host/Clean/Default)
+ $(1)/include/libelf/
+ $(CP) $(HOST_BUILD_DIR)/lib/libelf.a $(1)/lib/
endef
$(eval $(call HostBuild))
@@ -28,15 +28,10 @@ define Host/Prepare
endef
define Host/Install
- $(MAKE) -C $(HOST_BUILD_DIR) install
- $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(STAGING_DIR_HOST)/bin/libtool
- $(CP) $(STAGING_DIR_HOST)/bin/libtool $(STAGING_DIR_HOST)/bin/libtool-ucxx
- $(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx
-endef
-
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
+ $(call Host/Install/Default,$(1),)
+ $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(1)/bin/libtool
+ $(CP) $(1)/bin/libtool $(1)/bin/libtool-ucxx
+ $(SED) 's,-lstdc++,-luClibc++,g' $(1)/bin/libtool-ucxx
endef
$(eval $(call HostBuild))
@@ -28,11 +28,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/liblzma-old.a
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/lib/liblzma-old.a
+ $(INSTALL_DIR) $(1)/lib
+ $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(1)/lib/liblzma-old.a
endef
$(eval $(call HostBuild))
@@ -26,11 +26,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
-endef
-
-define Host/Clean
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(1)/bin/lzma
endef
$(eval $(call HostBuild))
@@ -21,9 +21,4 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
-endef
-
$(eval $(call HostBuild))
@@ -18,11 +18,8 @@ PKG_MIRROR_HASH:=d7ccd5e426b1d15331ff000a37dc15161f6eef594453e970fd584fcde5a2507
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/make_ext4fs $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/make_ext4fs
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/make_ext4fs $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -19,10 +19,10 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
- $(INSTALL_DATA) ./src/m4/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) ./src/bin/* $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/share/aclocal
+ $(INSTALL_DATA) ./src/m4/*.m4 $(1)/share/aclocal/
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) ./src/bin/* $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -34,13 +34,9 @@ define Host/Compile
endef
define Host/Install
- $(CP) $(HOST_BUILD_DIR)/tools/mkimage $(STAGING_DIR_HOST)/bin/
- $(CP) $(HOST_BUILD_DIR)/tools/mkenvimage $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/mkimage
- rm -f $(STAGING_DIR_HOST)/bin/mkenvimage
+ $(INSTALL_DIR) $(1)/bin
+ $(CP) $(HOST_BUILD_DIR)/tools/mkimage $(1)/bin/
+ $(CP) $(HOST_BUILD_DIR)/tools/mkenvimage $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -20,15 +20,12 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += -I$(CURDIR)/include
define Host/Install
- $(INSTALL_BIN) \
- $(HOST_BUILD_DIR)/src/mklibs \
- $(HOST_BUILD_DIR)/src/mklibs-copy \
- $(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \
- $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/mklibs*
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) \
+ $(HOST_BUILD_DIR)/src/mklibs \
+ $(HOST_BUILD_DIR)/src/mklibs-copy \
+ $(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \
+ $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -19,13 +19,8 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/mm-common-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
- $(INSTALL_DATA) $(HOST_BUILD_DIR)/macros/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
-endef
-
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
+ $(INSTALL_DIR) $(1)/share/aclocal
+ $(INSTALL_DATA) $(HOST_BUILD_DIR)/macros/*.m4 $(1)/share/aclocal/
endef
$(eval $(call HostBuild))
@@ -39,15 +39,12 @@ HOST_MAKE_FLAGS += \
PROGRAMS="mkfs.jffs2 ubinize mkfs.ubifs"
define Host/Install
+ $(INSTALL_DIR) $(1)/bin
$(CP) \
$(HOST_BUILD_DIR)/mkfs.jffs2 \
$(HOST_BUILD_DIR)/mkfs.ubifs \
$(HOST_BUILD_DIR)/ubinize \
- $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
+ $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -27,13 +27,9 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/mcopy $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/mmd $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/mcopy
- rm -f $(STAGING_DIR_HOST)/bin/mmd
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/mcopy $(1)/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/mmd $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -26,11 +26,8 @@ define Host/Configure
endef
define Host/Install
- $(CP) $(HOST_BUILD_DIR)/padjffs2 $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/padjffs2
+ $(INSTALL_DIR) $(1)/bin
+ $(CP) $(HOST_BUILD_DIR)/padjffs2 $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -16,13 +16,9 @@ define Host/Compile
endef
define Host/Install
- $(CP) $(HOST_BUILD_DIR)/patch-cmdline $(STAGING_DIR_HOST)/bin/
- $(CP) $(HOST_BUILD_DIR)/patch-dtb $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/patch-cmdline
- rm -f $(STAGING_DIR_HOST)/bin/patch-dtb
+ $(INSTALL_DIR) $(1)/bin
+ $(CP) $(HOST_BUILD_DIR)/patch-cmdline $(1)/bin/
+ $(CP) $(HOST_BUILD_DIR)/patch-dtb $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -19,8 +19,8 @@ HOST_FIXUP:=autoreconf
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/patchelf $(STAGING_DIR_HOST)/bin/patchelf
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/patchelf $(1)/bin/patchelf
endef
$(eval $(call HostBuild))
@@ -26,14 +26,9 @@ HOST_LDFLAGS += -framework CoreFoundation -framework Carbon
endif
define Host/Install
- $(MAKE) -C $(HOST_BUILD_DIR) install
- mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
- $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
-endef
-
-define Host/Clean
- -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
- $(call Host/Clean/Default)
+ $(call Host/Install/Default,$(1),)
+ mv $(1)/bin/pkg-config $(1)/bin/pkg-config.real
+ $(INSTALL_BIN) ./files/pkg-config $(1)/bin/pkg-config
endef
$(eval $(call HostBuild))
@@ -38,8 +38,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/qemu-img $(STAGING_DIR_HOST)/bin
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/qemu-img $(1)/bin
endef
$(eval $(call HostBuild))
@@ -24,12 +24,13 @@ define Host/Compile
endef
define Host/Install
- ./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST)
- rm -f $(STAGING_DIR_HOST)/bin/scons*.py
- for bin in $(STAGING_DIR_HOST)/bin/scons*; do \
+ ./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST) --root=$(HOST_INSTALL_DIR)
+ rm -f $(HOST_INSTALL_DIR)/$(STAGING_DIR_HOST)/bin/scons*.py
+ for bin in $(HOST_INSTALL_DIR)/$(STAGING_DIR_HOST)/bin/scons*; do \
mv "$$$$bin" "$$$$bin.py"; \
cp ./files/pywrap.sh "$$$$bin"; \
done
+ $(CP) $(HOST_INSTALL_DIR)/$(STAGING_DIR_HOST)/* $(1)/
endef
$(eval $(call HostBuild))
@@ -24,11 +24,8 @@ define Host/Configure
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/sdimage $(STAGING_DIR_HOST)/bin/sdimage
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/sdimage
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/sdimage $(1)/bin/sdimage
endef
$(eval $(call HostBuild))
@@ -36,11 +36,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/sed/sed $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/sed
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/sed/sed $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -18,7 +18,8 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(STAGING_DIR_HOST)/bin
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(1)/bin
endef
$(eval $(call HostBuild))
@@ -29,13 +29,9 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
- rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(1)/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -29,13 +29,9 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs $(STAGING_DIR_HOST)/bin/mksquashfs4
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs $(STAGING_DIR_HOST)/bin/unsquashfs4
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/mksquashfs4
- rm -f $(STAGING_DIR_HOST)/bin/unsquashfs4
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs $(1)/bin/mksquashfs4
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs $(1)/bin/unsquashfs4
endef
$(eval $(call HostBuild))
@@ -15,11 +15,8 @@ define Host/Compile
endef
define Host/Install
- $(CP) $(HOST_BUILD_DIR)/sstrip $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/sstrip
+ $(INSTALL_DIR) $(1)/bin
+ $(CP) $(HOST_BUILD_DIR)/sstrip $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -24,18 +24,13 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/wrt350nv2-builder $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/wrt350nv2-builder $(1)/bin/
# optionally the builder can add a u-boot binary to create a complete webupgrade image, but this is not mandatory
# u-boot images from stock firmware are available at ftp://ftp.maddes.net/openwrt/trunk/orion/stock/binaries/
[ ! -f "files/u-boot.bin" ] || ( \
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/wrt350nv2-builder; \
- $(CP) files/u-boot.bin $(STAGING_DIR_HOST)/share/wrt350nv2-builder/; )
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/bin/wrt350nv2-builder
- rm -f $(STAGING_DIR_HOST)/share/wrt350nv2-builder
+ $(INSTALL_DIR) $(1)/share/wrt350nv2-builder; \
+ $(CP) files/u-boot.bin $(1)/share/wrt350nv2-builder/; )
endef
$(eval $(call HostBuild))
@@ -29,7 +29,7 @@ HOST_CONFIGURE_ARGS += \
--with-pic
define Host/Install
- +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
+ $(call Host/Install/Default,$(1),install xzlinks="unxz xzcat")
endef
$(eval $(call HostBuild))
@@ -28,8 +28,8 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOST)/bin/
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(1)/bin/
endef
$(eval $(call HostBuild))
@@ -25,17 +25,13 @@ include $(INCLUDE_DIR)/cmake.mk
HOST_CFLAGS +=-fPIC
define Host/Install
- $(CP) $(HOST_BUILD_DIR)/libz.a $(STAGING_DIR_HOST)/lib/
- $(CP) $(HOST_BUILD_DIR)/zconf.h $(STAGING_DIR_HOST)/include/
- $(CP) $(HOST_BUILD_DIR)/zlib.h $(STAGING_DIR_HOST)/include/
- $(CP) $(HOST_BUILD_DIR)/zlib.pc $(STAGING_DIR_HOST)/lib/pkgconfig/
-endef
-
-define Host/Clean
- rm -f $(STAGING_DIR_HOST)/lib/libz.a
- rm -f $(STAGING_DIR_HOST)/include/zconf.h
- rm -f $(STAGING_DIR_HOST)/include/zlib.h
- rm -f $(STAGING_DIR_HOST)/lib/pkgconfig//zlib.pc
+ $(INSTALL_DIR) $(1)/lib
+ $(CP) $(HOST_BUILD_DIR)/libz.a $(1)/lib/
+ $(INSTALL_DIR) $(1)/include
+ $(CP) $(HOST_BUILD_DIR)/zconf.h $(1)/include/
+ $(CP) $(HOST_BUILD_DIR)/zlib.h $(1)/include/
+ $(INSTALL_DIR) $(1)/lib/pkgconfig
+ $(CP) $(HOST_BUILD_DIR)/zlib.pc $(1)/lib/pkgconfig/
endef
$(eval $(call HostBuild))
This updates Host/Install for many tools to install files into the given staging directory, instead of into $(STAGING_DIR_HOST) directly, so that files can be automatically tracked and uninstalled. This also removes Host/Clean (now necessary) for many tools. Signed-off-by: Jeffery To <jeffery.to@gmail.com> --- tools/automake/Makefile | 21 ++++++++------------- tools/b43-tools/Makefile | 17 +++++------------ tools/bison/Makefile | 9 ++------- tools/cbootimage-configs/Makefile | 8 ++------ tools/cbootimage/Makefile | 5 ----- tools/ccache/Makefile | 12 ++++-------- tools/e2fsprogs/Makefile | 18 +++++++----------- tools/elftosb/Makefile | 3 ++- tools/expat/Makefile | 4 ---- tools/firmware-utils/Makefile | 3 ++- tools/flex/Makefile | 9 ++------- tools/flock/Makefile | 3 ++- tools/genext2fs/Makefile | 7 ++----- tools/gengetopt/Makefile | 7 ++----- tools/kernel2minor/Makefile | 7 ++----- tools/libelf/Makefile | 12 +++--------- tools/libtool/Makefile | 13 ++++--------- tools/lzma-old/Makefile | 7 ++----- tools/lzma/Makefile | 7 ++----- tools/m4/Makefile | 5 ----- tools/make-ext4fs/Makefile | 7 ++----- tools/missing-macros/Makefile | 8 ++++---- tools/mkimage/Makefile | 10 +++------- tools/mklibs/Makefile | 15 ++++++--------- tools/mm-macros/Makefile | 9 ++------- tools/mtd-utils/Makefile | 7 ++----- tools/mtools/Makefile | 10 +++------- tools/padjffs2/Makefile | 7 ++----- tools/patch-image/Makefile | 10 +++------- tools/patchelf/Makefile | 4 ++-- tools/pkg-config/Makefile | 11 +++-------- tools/qemu/Makefile | 4 ++-- tools/scons/Makefile | 7 ++++--- tools/sdimage/Makefile | 7 ++----- tools/sed/Makefile | 7 ++----- tools/sparse/Makefile | 3 ++- tools/squashfs/Makefile | 10 +++------- tools/squashfskit4/Makefile | 10 +++------- tools/sstrip/Makefile | 7 ++----- tools/wrt350nv2-builder/Makefile | 13 ++++--------- tools/xz/Makefile | 2 +- tools/zip/Makefile | 4 ++-- tools/zlib/Makefile | 18 +++++++----------- 43 files changed, 119 insertions(+), 248 deletions(-)