diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-05-17 14:09:36 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-05-17 14:15:40 +0200 |
| commit | 61d753ae06893f786cabdbd326ba5eafb8de5527 (patch) | |
| tree | d465406de5aeaaede31054d50893b9de2d59010f | |
| parent | 6f8a9ebf23e2eebcfa0273fa5e17b300f3696410 (diff) | |
| download | ptxdist-61d753ae06893f786cabdbd326ba5eafb8de5527.tar.gz ptxdist-61d753ae06893f786cabdbd326ba5eafb8de5527.tar.xz | |
ptxd_make_pkghash: make sure the correct data is added to the different hash files
The kconfig symbols must not be added to the <PKG>_EXTRACT hash, so
split the initial data:
kconfig symbols in pkghash-<PKG> and the checksum / source file in
pkghash-<PKG>_EXTRACT. Both files are then read again and combinded as
follows:
Everything for the package and its direct dependencies in pkghash-<PKG>
and only the checksum / source and patches of the package itself in
pkghash-<PKG>_EXTRACT.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 2 | ||||
| -rwxr-xr-x | scripts/lib/ptxd_make_pkghash.awk | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 990316d58..0e36b5e35 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -476,7 +476,7 @@ function write_deps_pkg_active_cfghash(this_PKG, this_pkg) { print "ifneq ($(" this_PKG "_SOURCE),)" > DGEN_DEPS_POST; print "ifdef PTXDIST_SETUP_ONCE" > DGEN_DEPS_POST; print "_tmp :=$(foreach source, $(" this_PKG "_SOURCES),$($($(source))_MD5) $(notdir $(source)))" > DGEN_DEPS_POST; - print "$(file >>" PTXDIST_TEMPDIR "/pkghash-" this_PKG ",$(_tmp))" > DGEN_DEPS_POST; + print "$(file >>" PTXDIST_TEMPDIR "/pkghash-" this_PKG "_EXTRACT,$(_tmp))" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; diff --git a/scripts/lib/ptxd_make_pkghash.awk b/scripts/lib/ptxd_make_pkghash.awk index 6cbf85d71..c7a273166 100755 --- a/scripts/lib/ptxd_make_pkghash.awk +++ b/scripts/lib/ptxd_make_pkghash.awk @@ -51,12 +51,16 @@ function read_file(src, data, pkg, tmp) { END { for (pkg in rules) { f1 = PTXDIST_TEMPDIR "/pkghash-" pkg + f2 = PTXDIST_TEMPDIR "/pkghash-" pkg "_EXTRACT" old_RS = RS RS = "^$" getline tmp < f1 + data[pkg] = tmp + getline tmp < f2 + extract_data[pkg] = tmp RS = old_RS close(f1) - extract_data[pkg] = data[pkg] = tmp + close(f2) } for (pkg in rules) { n = split(rules[pkg], cfgs) |