EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accidentially broke sdk and imagebuilder in [6857]

Browse Source 
SVN-Revision: 6858
This commit is contained in:
Mike Baker 2007-04-03 23:29:02 +00:00
parent 23efe5fc83
commit 8101912ed6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/imagebuilder/Makefile
View File

@ -25,7 +25,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \ $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
$(TOPDIR)/rules.mk $(TOPDIR)/.config \ $(TOPDIR)/rules.mk $(TOPDIR)/.config \
$(TMP_DIR)/.target.mk \ $(TMP_DIR)/.target.mk \
$(TMP_DIR)/.pkginfo \ $(TMP_DIR)/.packageinfo \
$(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.targetinfo \
./files/Makefile \ ./files/Makefile \
$(IB_BUILD_DIR)/ $(IB_BUILD_DIR)/

12
target/sdk/files/Makefile
View File

@ -42,16 +42,16 @@ define stamp
tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
endef endef
STAMP=$(call stamp,pkginfo,package) STAMP=$(call stamp,packageinfo,package)
$(STAMP): $(STAMP):
@mkdir -p tmp/info @mkdir -p tmp/info
@rm -f tmp/info/.stamp-pkginfo* @rm -f tmp/info/.stamp-packageinfo*
@touch $@ @touch $@
define filedep define filedep
$(foreach FILE,$(shell ls package/*/Makefile), $(foreach FILE,$(shell ls package/*/Makefile),
tmp/.pkginfo: $(FILE) tmp/.packageinfo: $(FILE)
$(FILE): $(FILE):
@true @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 $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1
download: FORCE download: FORCE