diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-09 17:25:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-09 17:25:20 +0000 |
| commit | 1e24383ae661cc561b9d2b87cfd218e0aedf43d9 (patch) | |
| tree | d64eb8490a4a62089c2384ec6c007a673d6e2435 /target | |
| parent | 2fe806c2bf3f3b3f794a2cad74643012204a2e5d (diff) | |
| download | upstream-1e24383ae661cc561b9d2b87cfd218e0aedf43d9.tar.gz upstream-1e24383ae661cc561b9d2b87cfd218e0aedf43d9.tar.bz2 upstream-1e24383ae661cc561b9d2b87cfd218e0aedf43d9.zip | |
Various enhancements from Manuel Munz <freifunk@somakoma.de> - don't regenerate Package index unless the packagedir changes - remove opkg lists from rootfs, saves > 1MB uncompressed - don't direct errors on index creation into packagelist
SVN-Revision: 28205
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/files/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 902568b6dd..e8d282a8f0 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -100,7 +100,13 @@ _call_image: echo rm -rf $(TARGET_DIR) mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) - $(MAKE) package_index + if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \ + echo "Package list missing or not up-to-date, generating it.";\ + $(MAKE) package_index; \ + else \ + mkdir -p $(TARGET_DIR)/tmp; \ + $(OPKG) update; \ + fi $(MAKE) package_install ifneq ($(USER_FILES),) $(MAKE) copy_files @@ -112,7 +118,7 @@ package_index: FORCE @echo @echo Building package index... @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ + (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ gzip -9c Packages > Packages.gz \ ) >/dev/null 2>/dev/null $(OPKG) update @@ -121,6 +127,7 @@ package_install: FORCE @echo @echo Installing packages... $(OPKG) install $(BUILD_PACKAGES) + rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* copy_files: FORCE @echo |