use bundle-libraries.sh to install required host utilities into imagebuilder staging tree

SVN-Revision: 33196
master
Jo-Philipp Wich 12 years ago
parent 183f625a48
commit a062e08bb4
  1. 3
      target/imagebuilder/Makefile

@ -37,7 +37,6 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(PKG_BUILD_DIR)/ $(PKG_BUILD_DIR)/
$(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf $(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf
$(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
$(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/
$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
rm -rf \ rm -rf \
$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
@ -47,6 +46,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(XARGS) rm -rf | $(XARGS) rm -rf
find $(STAGING_DIR_HOST)/bin -maxdepth 1 -type f -perm -u=x \
| $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host/bin
$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
download: download:

Loading…
Cancel
Save