fix the sdk

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

diff --git a/package/Makefile b/package/Makefile
index 799456b1ba43fa97cc7facebbaec11ca4a414ea7..06e91042bc63a5adf07dab02730d755b05db83f2 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -40,12 +40,8 @@ $(STAMP_DIR) $(TARGET_DIR):
 %-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
-endif
-
 $(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-       @$(TOPDIR)/scripts/metadata.pl package_mk $(GENDEP_OPTS) < $< > $@ || rm -f $@
+       @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
 
 preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))

diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile
index 7f42b697ab18867272759dbde3dc5f3c43dd3c8e..184a1f9e42fe68a64eec841b1d5f079334bff047 100644 (file)
--- a/target/sdk/files/Makefile
+++ b/target/sdk/files/Makefile
@@ -33,21 +33,38 @@ export DEVELOPER
 SDK=1
 export SDK
 
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+include $(TOPDIR)/include/verbose.mk
+
 all: world
 
-.pkginfo: FORCE
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-       @echo Collecting package info...
-       @-for dir in package/*/; do \
-               echo Source-Makefile: $${dir}Makefile; \
-               $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
-       done > $@
-endif
+define stamp
+tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
+endef
+
+STAMP=$(call stamp,pkginfo,package)
+
+$(STAMP):
+       @mkdir -p tmp/info
+       @rm -f tmp/info/.stamp-pkginfo*
+       @touch $@
+
+define filedep
+$(foreach FILE,$(shell ls package/*/Makefile),
+tmp/.pkginfo: $(FILE)
+$(FILE):
+       @true
+)
+endef
+
+$(eval $(filedep))
 
-pkginfo-clean: FORCE
-       -rm -f .pkginfo .config.in
+tmp/.pkginfo: $(STAMP)
+       @echo -n Collecting package info... 
+       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS=""
 
-package/%: .pkginfo FORCE
+package/%: FORCE
+       @$(NO_TRACE_MAKE) -s tmp/.pkginfo
        $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1
 
 download: FORCE