[source] Revert "build: always run package/cleanup before package/compile"

LEDE Commits lede-commits at lists.infradead.org
Sun Jan 22 04:47:48 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/664918d891f3d29f09c15b0abe6616bbfdb2d0c6

commit 664918d891f3d29f09c15b0abe6616bbfdb2d0c6
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sun Jan 22 13:47:24 2017 +0100

    Revert "build: always run package/cleanup before package/compile"
    
    This reverts commit 2990a21058243b067bb56fed36ee69205595993e.
    This introduces a race condition, let's fix this in buildbot instead.
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 Makefile         | 2 +-
 package/Makefile | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 648fef5..a26eeee 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ else
 
 $(toolchain/stamp-compile): $(tools/stamp-compile)
 $(target/stamp-compile): $(toolchain/stamp-compile) $(tools/stamp-compile) $(BUILD_DIR)/.prepared
-$(package/stamp-compile): $(target/stamp-compile)
+$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
 $(package/stamp-install): $(package/stamp-compile)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
 check: $(tools/stamp-check) $(toolchain/stamp-check) $(package/stamp-check)
diff --git a/package/Makefile b/package/Makefile
index b5e4bfa..6929c47 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -49,8 +49,6 @@ PACKAGE_INSTALL_FILES:= \
 $(curdir)/cleanup: $(TMP_DIR)/.build
 	rm -rf $(STAGING_DIR_ROOT)
 
-$(curdir)/compile: $(curdir)/cleanup
-
 $(curdir)/merge:
 	rm -rf $(PACKAGE_DIR_ALL)
 	mkdir -p $(PACKAGE_DIR_ALL)
@@ -100,6 +98,7 @@ $(curdir)/preconfig:
 $(curdir)/flags-install:= -j1
 
 $(eval $(call stampfile,$(curdir),package,prereq,.config))
+$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,check,$(TMP_DIR)/.build))



More information about the lede-commits mailing list