Accidentially broke sdk and imagebuilder in [6857]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6858 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index d96a276..cf4a6fe 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -25,7 +25,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \

-               $(TMP_DIR)/.pkginfo \
+               $(TMP_DIR)/.packageinfo \

                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/
                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/

diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile
index 184a1f9..2f8451b 100644 (file)
--- a/target/sdk/files/Makefile
+++ b/target/sdk/files/Makefile
@@ -42,16 +42,16 @@ define stamp
 tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
 endef
 
 tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
 endef
 

-STAMP=$(call stamp,pkginfo,package)
+STAMP=$(call stamp,packageinfo,package)

 
 $(STAMP):
        @mkdir -p tmp/info
 
 $(STAMP):
        @mkdir -p tmp/info

-       @rm -f tmp/info/.stamp-pkginfo*
+       @rm -f tmp/info/.stamp-packageinfo*

        @touch $@
 
 define filedep
 $(foreach FILE,$(shell ls package/*/Makefile),
        @touch $@
 
 define filedep
 $(foreach FILE,$(shell ls package/*/Makefile),

-tmp/.pkginfo: $(FILE)
+tmp/.packageinfo: $(FILE)

 $(FILE):
        @true
 )
 $(FILE):
        @true
 )


@@ -59,12 +59,12 @@ endef
 
 $(eval $(filedep))
 
 
 $(eval $(filedep))
 

-tmp/.pkginfo: $(STAMP)
+tmp/.packageinfo: $(STAMP)

        @echo -n Collecting package info... 
        @echo -n Collecting package info... 

-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS=""
+       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS=""

 
 package/%: FORCE
 
 package/%: FORCE

-       @$(NO_TRACE_MAKE) -s tmp/.pkginfo
+       @$(NO_TRACE_MAKE) -s tmp/.packageinfo

        $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1
 
 download: FORCE
        $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1
 
 download: FORCE