ar71xx: switch to kmod-gpio-button-hotplug

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

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 902568b..f74b407 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -38,7 +38,7 @@ Building images:
        By default 'make image' will create an image with the default
        target profile and package set. You can use the following parameters
        to change that:
        By default 'make image' will create an image with the default
        target profile and package set. You can use the following parameters
        to change that:

-       
+

        make image PROFILE="<profilename>" # override the default target profile
        make image PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
        make image FILES="<path>" # include extra files from <path>
        make image PROFILE="<profilename>" # override the default target profile
        make image PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
        make image FILES="<path>" # include extra files from <path>


@@ -100,19 +100,25 @@ _call_image:
        echo
        rm -rf $(TARGET_DIR)
        mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
        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
 endif
        $(MAKE) package_postinst
        $(MAKE) build_image
        $(MAKE) package_install
 ifneq ($(USER_FILES),)
        $(MAKE) copy_files
 endif
        $(MAKE) package_postinst
        $(MAKE) build_image

-       
+

 package_index: FORCE
        @echo
        @echo Building package index...
        @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp
 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
                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)
        @echo
        @echo Installing packages...
        $(OPKG) install $(BUILD_PACKAGES)

+       rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*

 
 copy_files: FORCE
        @echo
 
 copy_files: FORCE
        @echo


@@ -145,8 +152,9 @@ package_postinst: FORCE
 build_image: FORCE
        @echo
        @echo Building images...
 build_image: FORCE
        @echo
        @echo Building images...

-       $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1
-       
+       $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \
+               $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
+

 clean:
        rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR)
 
 clean:
        rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR)