[source] build: fix cleaning configured stamp file
LEDE Commits
lede-commits at lists.infradead.org
Sat Oct 15 02:37:33 PDT 2016
blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/4eb371e363587e4fd1f685c99f654895e198c517
commit 4eb371e363587e4fd1f685c99f654895e198c517
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Mon Sep 26 21:14:50 2016 +0800
build: fix cleaning configured stamp file
We have packages with their own parts appended to standard STAMP_CONFIGURED
(mostly with an underscore character). This will render the current
STAMP_CONFIGURED_WILD setting invalid and the build system may miss a rebuild
on config change
1. Build with config A
2. Build with config B, yet .configured_A_xx did not get cleaned
3. Return to config A, but rebuild will not happen because stamp file
of config A still exists
Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
include/package.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/package.mk b/include/package.mk
index fa5c4e7..99e401e 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -64,7 +64,7 @@ else
STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))$(call confvar,$(PKG_PREPARED_DEPENDS)))
endif
STAMP_CONFIGURED=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
-STAMP_CONFIGURED_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))
+STAMP_CONFIGURED_WILDCARD=$(PKG_BUILD_DIR)/.configured_*
STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),)_installed
More information about the lede-commits
mailing list