From: Mike Baker <mbm@openwrt.org>
Date: Tue, 3 Apr 2007 23:29:02 +0000 (+0000)
Subject: Accidentially broke sdk and imagebuilder in [6857]
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=commitdiff_plain;h=8101912ed65a08e15b2f97cb92aa7f0e4ad6bd8d;hp=23efe5fc834671d6d2842630ec28ed829a298fe9

Accidentially broke sdk and imagebuilder in [6857]

SVN-Revision: 6858
---

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index d96a27674b..cf4a6fe1a1 100644
--- 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 \
-		$(TMP_DIR)/.pkginfo \
+		$(TMP_DIR)/.packageinfo \
 		$(TMP_DIR)/.targetinfo \
 		./files/Makefile \
 		$(IB_BUILD_DIR)/
diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile
index 184a1f9e42..2f8451bf78 100644
--- 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
 
-STAMP=$(call stamp,pkginfo,package)
+STAMP=$(call stamp,packageinfo,package)
 
 $(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),
-tmp/.pkginfo: $(FILE)
+tmp/.packageinfo: $(FILE)
 $(FILE):
 	@true
 )
@@ -59,12 +59,12 @@ endef
 
 $(eval $(filedep))
 
-tmp/.pkginfo: $(STAMP)
+tmp/.packageinfo: $(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=""
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS=""
 
 package/%: FORCE
-	@$(NO_TRACE_MAKE) -s tmp/.pkginfo
+	@$(NO_TRACE_MAKE) -s tmp/.packageinfo
 	$(MAKE) -C package $(patsubst package/%,%,$@) SDK=1
 
 download: FORCE