mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 01:43:08 +02:00
fix a dependency bug
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8561 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
47c286261b
commit
5b1e271684
@ -38,7 +38,7 @@ endef
|
|||||||
define stampfile
|
define stampfile
|
||||||
$(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)
|
$(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)
|
||||||
$$($(1)/stamp-$(3)): $(TMP_DIR)/.build
|
$$($(1)/stamp-$(3)): $(TMP_DIR)/.build
|
||||||
@+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) || \
|
@+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \
|
||||||
$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)
|
$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)
|
||||||
@mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
|
@mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
|
||||||
@touch $$($(1)/stamp-$(3))
|
@touch $$($(1)/stamp-$(3))
|
||||||
|
@ -40,15 +40,10 @@ $(curdir)/index: FORCE
|
|||||||
|
|
||||||
$(curdir)/flags-install:= -j1
|
$(curdir)/flags-install:= -j1
|
||||||
|
|
||||||
$(eval $(call stampfile,$(curdir),package,prereq))
|
$(eval $(call stampfile,$(curdir),package,prereq,.config))
|
||||||
$(eval $(call stampfile,$(curdir),package,cleanup))
|
$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
|
||||||
$(eval $(call stampfile,$(curdir),package,compile))
|
$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
|
||||||
$(eval $(call stampfile,$(curdir),package,install))
|
$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
|
||||||
$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
|
$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build))
|
||||||
|
|
||||||
$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build
|
|
||||||
$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build
|
|
||||||
$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build
|
|
||||||
$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build
|
|
||||||
|
|
||||||
$(eval $(call subdir,$(curdir)))
|
$(eval $(call subdir,$(curdir)))
|
||||||
|
@ -12,12 +12,10 @@ $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),ima
|
|||||||
|
|
||||||
$(curdir)/imagebuilder/prepare:=$(curdir)/linux/install
|
$(curdir)/imagebuilder/prepare:=$(curdir)/linux/install
|
||||||
|
|
||||||
$(eval $(call stampfile,$(curdir),target,prereq))
|
$(eval $(call stampfile,$(curdir),target,prereq,.config))
|
||||||
$(eval $(call stampfile,$(curdir),target,compile))
|
$(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build))
|
||||||
$(eval $(call stampfile,$(curdir),target,install))
|
$(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build))
|
||||||
|
|
||||||
$($(curdir)/stamp-prereq): .config
|
|
||||||
$($(curdir)/stamp-compile): $(TMP_DIR)/.build
|
|
||||||
$($(curdir)/stamp-install): $($(curdir)/stamp-compile)
|
$($(curdir)/stamp-install): $($(curdir)/stamp-compile)
|
||||||
|
|
||||||
$(eval $(call subdir,$(curdir)))
|
$(eval $(call subdir,$(curdir)))
|
||||||
|
Loading…
Reference in New Issue
Block a user