diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-01 21:33:32 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-01 21:38:25 +0200 |
| commit | 09dc30ae2fa49a461cd339677e5f6c5e71cc6955 (patch) | |
| tree | 997b0344eda48bc65d940d15d902447da6bd4941 /scripts | |
| parent | d7cc755f2ddef75c6ab25171df07388e04d5a0cb (diff) | |
| download | ptxdist-09dc30ae2fa49a461cd339677e5f6c5e71cc6955.tar.gz ptxdist-09dc30ae2fa49a461cd339677e5f6c5e71cc6955.tar.xz | |
fix package hash calculation with --progress
With the latest changes, some things where added to the hash file twice
when --progress was used. As a result, the hashes where different with and
without --progress.
Introduce a helper variable that determintes if make is called for the
first time and use it everywhere.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index c4c749609..9b97a91d3 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -213,8 +213,11 @@ $1 ~ /^PTXCONF_/ { do { if (this_PKG in PKG_to_pkg || this_PKG in virtual_pkg) { PKG_HASHFILE = PTXDIST_TEMPDIR "/pkghash-" this_PKG; - if (!($0 in allsym)) + if (!($0 in allsym)) { + print "ifdef PTXDIST_SETUP_ONCE" > DGEN_DEPS_POST; print "$(file >>" PKG_HASHFILE "," $1 "=$(" $1 "))" > DGEN_DEPS_POST; + print "endif" > DGEN_DEPS_POST; + } break; } } while (sub(/_+[^_]+$/, "", this_PKG)); @@ -387,12 +390,12 @@ function write_deps_pkg_active_cfghash(this_PKG, this_pkg) { print "ifeq ($(" this_PKG "_PATCH_DIR),)" > DGEN_DEPS_POST; print "undefine " this_PKG "_PATCH_DIR" > DGEN_DEPS_POST; print "else" > DGEN_DEPS_POST; - print "ifeq ($(PTXDIST_PKGHASH_MAKE),)" > DGEN_DEPS_POST; + print "ifdef PTXDIST_SETUP_ONCE" > DGEN_DEPS_POST; print "$(file >>" PTXDIST_TEMPDIR "/pkghash.list,PATCHES: " this_PKG " $(" this_PKG "_PATCH_DIR))" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; - print "ifeq ($(PTXDIST_PKGHASH_MAKE),)" > DGEN_DEPS_POST; + print "ifdef PTXDIST_SETUP_ONCE" > DGEN_DEPS_POST; print this_PKG "_CONFIG := $(" this_PKG "_CONFIG)" > DGEN_DEPS_POST; print "ifeq ($(" this_PKG "_CONFIG),)" > DGEN_DEPS_POST; print "undefine " this_PKG "_CONFIG" > DGEN_DEPS_POST; @@ -572,7 +575,6 @@ function write_deps_pkg_active_image(this_PKG, this_pkg, prefix) { } END { - print "PTXDIST_PKGHASH_MAKE := $(wildcard " PTXDIST_TEMPDIR "/pkghash.make)" > DGEN_DEPS_POST; # writing maps first as this affect the pkghash via virtual packages for (this_PKG in PKG_to_pkg) { this_pkg = PKG_to_pkg[this_PKG]; @@ -583,7 +585,7 @@ END { for (this_PKG in active_PKG_to_pkg) write_deps_pkg_active_cfghash(this_PKG, this_pkg) - print "ifeq ($(PTXDIST_PKGHASH_MAKE),)" > DGEN_DEPS_POST; + print "ifdef PTXDIST_SETUP_ONCE" > DGEN_DEPS_POST; print "$(call ptx/force-sh, $(PTXDIST_LIB_DIR)/ptxd_make_pkghash.awk " PTXDIST_TEMPDIR "/pkghash.list)" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; |