imagebuilder: add package_list function

[openwrt/openwrt.git] / target / imagebuilder / files / Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index baa0e1f271993d1d063c55f045cf7eaf413559f7..d12cb7622f08fd76ab96f1bae845cbb2588bda9e 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -112,13 +112,7 @@ _call_image: staging_dir/host/.prereq-build
        echo
        rm -rf $(TARGET_DIR)
        mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
-       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 || true; \
-       fi
+       $(MAKE) package_reload
        $(MAKE) package_install
 ifneq ($(USER_FILES),)
        $(MAKE) copy_files
@@ -136,6 +130,19 @@ package_index: FORCE
        ) >/dev/null 2>/dev/null
        $(OPKG) update || true
 
+package_reload:
+       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 || true; \
+       fi
+
+package_list: FORCE
+       @$(MAKE) -s package_reload
+       @$(OPKG) list --size 2>/dev/null | awk -F" - " '{printf "%s %s %s\n", $$1, $$2, $$3}'
+
 package_install: FORCE
        @echo
        @echo Installing packages...