diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-09-09 17:25:20 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-09-09 17:25:20 +0000 |
| commit | def4e4e08f3cb013e169bbbf9e6a10c4b38c0228 (patch) | |
| tree | bb2794c405d6f4d0fe0bb869f156641e3f542505 /target/imagebuilder | |
| parent | 749a54b34cf93b0e497131c2dd47438832a92c35 (diff) | |
[imagebuilder] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28205 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/imagebuilder')
| -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 902568b6d..e8d282a8f 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 |