summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Congal <yoann.congal@smile.fr>2025-12-22 11:18:55 +0100
committerKhem Raj <raj.khem@gmail.com>2025-12-22 06:58:46 -0800
commit9b995cb29a42c4b7ee972bf4b95d3a12d6d837cd (patch)
treee975da87948b834a0b0b820b9f99c231ac0e0e8c
parent70126d71106094a075b680e2e07cf68b5e1957ff (diff)
downloadmeta-openembedded-9b995cb29a42c4b7ee972bf4b95d3a12d6d837cd.tar.gz
e2tools: join lines in generated file to fix buildpaths errors
The generated file "config.status" contains WORKDIR paths in strings literal split across multiple lines, like: S["foo"]="/path/to/work"\ "dir/" These line splits prevent the usual sed from working properly. Make a first pass on the file to undo any line split. Fixes this error (that may happen depending on TOPDIR path length): ERROR: e2tools-0.1.2-r0 do_package_qa: QA Issue: File /usr/lib/e2tools/ptest/build/config.status in package e2tools-ptest contains reference to TMPDIR [buildpaths] Seen on AB: https://autobuilder.yoctoproject.org/valkyrie/#/builders/87/builds/79/steps/13/logs/stdio Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb14
1 files changed, 14 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
index b7b925da0e..c9631f6219 100644
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -39,6 +39,20 @@ do_install_ptest() {
39 ${D}${PTEST_PATH}/build/autom4te.cache \ 39 ${D}${PTEST_PATH}/build/autom4te.cache \
40 ${D}${PTEST_PATH}/*/*/.git ${D}${PTEST_PATH}/*/*/.github \ 40 ${D}${PTEST_PATH}/*/*/.git ${D}${PTEST_PATH}/*/*/.github \
41 ${D}${PTEST_PATH}/*/*/autom4te.cache 41 ${D}${PTEST_PATH}/*/*/autom4te.cache
42
43 # config.status contains WORKDIR paths in strings literal split across
44 # multiple lines. ie
45 # S["foo"]="/path/to/work"\
46 # "dir/"
47 # These line splits prevent the following sed from working properly.
48 # Make a first pass on the file to undo any line split
49 sed '
50 :a;N;$!ba; # Read the whole file into the pattern buffer
51 s/"\\\n"//g # Delete "\<newline>" ie literal string line break
52 ' \
53 -i ${D}${PTEST_PATH}/build/config.status
54
55 # Now remove/replace the non-reproducible paths
42 sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ 56 sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \
43 -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ 57 -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
44 -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ 58 -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \