domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 28205
This commit is contained in:
Jo-Philipp Wich
2011-09-09 17:25:20 +00:00
parent 2fe806c2bf
commit 1e24383ae6
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
target/imagebuilder/files/Makefile
View File

@@ -100,7 +100,13 @@ _call_image:
echo echo
rm -rf $(TARGET_DIR) rm -rf $(TARGET_DIR)
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_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 $(MAKE) package_install
ifneq ($(USER_FILES),) ifneq ($(USER_FILES),)
$(MAKE) copy_files $(MAKE) copy_files
@@ -112,7 +118,7 @@ package_index: FORCE
@echo @echo
@echo Building package index... @echo Building package index...
@mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp @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 \ gzip -9c Packages > Packages.gz \
) >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null
$(OPKG) update $(OPKG) update
@@ -121,6 +127,7 @@ package_install: FORCE
@echo @echo
@echo Installing packages... @echo Installing packages...
$(OPKG) install $(BUILD_PACKAGES) $(OPKG) install $(BUILD_PACKAGES)
rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*
copy_files: FORCE copy_files: FORCE
@echo @echo