Skip to content

Commit

Permalink
[iamgebuilder] use bundle-libraries.sh to install required host utili…
Browse files Browse the repository at this point in the history
…ties into imagebuilder staging tree

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33196 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
jow committed Aug 15, 2012
1 parent f175e72 commit 9fa158c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion target/imagebuilder/Makefile
Expand Up @@ -37,7 +37,6 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(PKG_BUILD_DIR)/
$(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf
$(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/
rm -rf \
$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
Expand All @@ -47,6 +46,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(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 > $@

download:
Expand Down

0 comments on commit 9fa158c

Please sign in to comment.