diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-03 17:16:49 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-04 08:16:28 +0100 |
| commit | b6da30651adb631ddc63e4cce1c5c07e81ae2ced (patch) | |
| tree | 0addc890e3953056fb423e05dfc85eb70b1a2e85 | |
| parent | c7d53b7d511e3ab698a9d8a565a1093569b769f7 (diff) | |
| download | ptxdist-b6da30651adb631ddc63e4cce1c5c07e81ae2ced.tar.gz ptxdist-b6da30651adb631ddc63e4cce1c5c07e81ae2ced.tar.xz | |
ptxd_lib_dgen: fix --dirty handling with source changes
Since 7484e039302c1369042c7436f6e97d18fff2d938 ("ptxd_lib_dgen: let .get
depend on .srchash") 'get' depends on the src-hash and not 'extract'. This
breaks the --dirty handling:
'extract' fails because the source exists and suggests to use '--dirty'.
However, at that point, 'get' is already newer than 'extract' so it is
still rebuild.
Fix this by making the 'get -> extract' dependency existence only when
'--dirty' is used.
Fixes: 7484e039302c ("ptxd_lib_dgen: let .get depend on .srchash")
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 4c8710cc9..17748111b 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -453,8 +453,10 @@ function write_deps_pkg_active(this_PKG, this_pkg, prefix) { print "endif" > DGEN_DEPS_POST; print "$(STATEDIR)/" this_pkg ".get: " \ "$(STATEDIR)/" this_pkg ".$(" this_PKG "_EXTRACT_CFGHASH).srchash" > DGEN_DEPS_POST; - } - print "$(STATEDIR)/" this_pkg ".extract: " "$(STATEDIR)/" this_pkg ".get" > DGEN_DEPS_POST; + print "$(STATEDIR)/" this_pkg ".extract: " "$(STATEDIR)/" this_pkg ".get" > DGEN_DEPS_POST; + } else + print "$(STATEDIR)/" this_pkg ".extract: | " "$(STATEDIR)/" this_pkg ".get" > DGEN_DEPS_POST; + print "$(STATEDIR)/" this_pkg ".extract.post: " "$(STATEDIR)/" this_pkg ".extract" > DGEN_DEPS_POST; print "$(STATEDIR)/" this_pkg ".prepare: " "$(STATEDIR)/" this_pkg ".extract.post" > DGEN_DEPS_POST; if (DIRTY != "true") { |