From: Matthias Schiffer Date: Sun, 10 Dec 2017 14:30:30 +0000 (+0100) Subject: include/package.mk: remove old configured stamps before attempting configuration X-Git-Tag: v18.06.0-rc1~1461 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=307b29032fc357161505239cad794a99d07b69f4;p=openwrt%2Fstaging%2Fxback.git include/package.mk: remove old configured stamps before attempting configuration Some packages, e.g. busybox, explicitly remove old .configured stamps before attempting configuration, rather than after the actual configuration step. This seems like a good idea, as there will be no stamp left if configuration fails. Change generic rules to work like this, so package- specific rules can be dropped. Signed-off-by: Matthias Schiffer --- diff --git a/include/package.mk b/include/package.mk index e804b02b04..78ea5d0ef8 100644 --- a/include/package.mk +++ b/include/package.mk @@ -168,11 +168,11 @@ define Build/CoreTargets $(call Build/Exports,$(STAMP_CONFIGURED)) $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(STAMP_CONFIGURED_DEPENDS) + rm -f $(STAMP_CONFIGURED_WILDCARD) $(CleanStaging) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(Build/Configure) $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep)) - rm -f $(STAMP_CONFIGURED_WILDCARD) touch $$@ $(call Build/Exports,$(STAMP_BUILT))