diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-12-06 12:49:03 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-12-06 12:53:28 +0100 |
commit | 5c9c4ca6924abb8c90fcfadcd9a6cada3ebd416a (patch) | |
tree | a30adce2b60416e602e87e40d9877bb895eee0fc /scripts/lib/ptxd_lib_dgen.awk | |
parent | e80d54b89a75c81f1c89ab9adcee1c8921416361 (diff) | |
download | ptxdist-5c9c4ca6924abb8c90fcfadcd9a6cada3ebd416a.tar.gz ptxdist-5c9c4ca6924abb8c90fcfadcd9a6cada3ebd416a.tar.xz |
ptxd_lib_dgen: fix pkghash for manually included menu files
Manual includes are relative to the temporary kconfig file tree. The
current working directory for ptxd_lib_dgen.awk is the workspace, so these
relative files are not found.
Add the correct absolute prefix for these files to fix this.
Also, make 'tmp' und dump_file() a local variable to ensure that it does
not contain old contents.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_lib_dgen.awk')
-rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 09a674847..f7143c028 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -80,7 +80,7 @@ $0 ~ /^include[[:space:]]+\/.*\.make$/ { } -function dump_file(src, dst) { +function dump_file(src, dst, tmp) { if (!src) return @@ -186,8 +186,13 @@ $1 ~ /^PTX_MAP_._DEP/ { $1 ~ /^PTX_MAP_._SOURCE/ { this_PKG = gensub(/PTX_MAP_._SOURCE_/, "", "g", $1); - if (this_PKG in PKG_to_pkg) - PKG_to_infile[this_PKG] = $2; + if (this_PKG in PKG_to_pkg) { + if (index($2, "/") != 1) + tmp = PTXDIST_TEMPDIR "/kconfig/" $2; + else + tmp = $2 + PKG_to_infile[this_PKG] = tmp; + } next; } |