diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-23 00:31:35 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-23 00:31:45 +0200 |
| commit | 6b04e293fae775d919d27b4fc0f0face135c0e5c (patch) | |
| tree | 16f2312632a848c0d64bd0a64cc437c33308afca /scripts | |
| parent | 237b89ecc8b5d62fd73260cff0f75249874297e5 (diff) | |
| download | ptxdist-6b04e293fae775d919d27b4fc0f0face135c0e5c.tar.gz ptxdist-6b04e293fae775d919d27b4fc0f0face135c0e5c.tar.xz | |
ptxd_lib_dgen: handle --progress correctly
In that case make is called twice. Append the <PKG>_CONFIG file to the hash
file only once. Otherwise a incorrect hash is generated when --progress is
used.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index f21811be5..645064f83 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -344,7 +344,10 @@ function write_deps_pkg_all(this_PKG, this_pkg) { function write_deps_pkg_active_cfghash(this_PKG, this_pkg) { print "ifneq ($(filter /%,$(" this_PKG "_CONFIG)),)" > DGEN_DEPS_POST; print "ifneq ($(wildcard $(" this_PKG "_CONFIG)),)" > DGEN_DEPS_POST; - print "$(call ptx/force-sh, cat '$(" this_PKG "_CONFIG)' >> " PTXDIST_TEMPDIR "/pkghash-" this_PKG ")" > DGEN_DEPS_POST; + print "ifeq ($(wildcard " PTXDIST_TEMPDIR "/pkghash-" this_PKG ".done),)" > DGEN_DEPS_POST; + print "$(call ptx/force-sh, cat '$(" this_PKG "_CONFIG)' >> " PTXDIST_TEMPDIR "/pkghash-" this_PKG \ + " && touch " PTXDIST_TEMPDIR "/pkghash-" this_PKG ".done )" > DGEN_DEPS_POST; + print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; } |