From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 22 May 2018 07:18:33 +0000 (+0200)
Subject: build: prevent spurious package rebuilds under CONFIG_AUTOREMOVE
X-Git-Tag: v18.06.0-rc1~173
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff8bde52961d60afb30a113c9ca755e6b1c7cbe6;p=openwrt%2Fopenwrt.git

build: prevent spurious package rebuilds under CONFIG_AUTOREMOVE

When CONFIG_AUTOREMOVE is enabled, the build system touches an additional
".autoremove" stamp file in the cleaned build directory.

Since the autoremove stamp file is touched after the compile process
completed, it ends up being the most recent file of the package build
directory, causing the timestamp.pl check of depends.mk to erroneously
declare the ".built" and ".prepared" stamp files as stale, triggering
a forced clean-build submake process.

Fix the problem by using the ".built" stamp file as modification time
reference when touching the ".autoremove" stamp file.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b287c82bed6673648a69be6c1cf84abe8885a3c4)
---

diff --git a/include/package.mk b/include/package.mk
index 9912c86d6b..2473eecb92 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -228,7 +228,7 @@ define Build/CoreTargets
 
   ifneq ($(CONFIG_AUTOREMOVE),)
     compile:
-		-touch $(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null
+		-touch -r $(PKG_BUILD_DIR)/.built $(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null
 		$(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' | \
 			$(XARGS) rm -rf
   endif