From 5c9c4ca6924abb8c90fcfadcd9a6cada3ebd416a Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 6 Dec 2018 12:49:03 +0100 Subject: 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 --- scripts/lib/ptxd_lib_dgen.awk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts/lib/ptxd_lib_dgen.awk') 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; } -- cgit v1.2.3