From 7c5fd57f845a3a4c4d0b5754bcfa53ca1357e229 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Nov 2025 14:56:31 -0800 Subject: [PATCH] e2tools: Fix buildpaths in ptests Currently the path checks are escaping QA check for buildpath detection but config.status still has paths which show up in reproduciblity failures, comparing build in path A and build in path B, content of config.status don't end up same. Signed-off-by: Khem Raj (cherry picked from commit 0856c5613234c61d809b9c983bc45c750144ebd8) Signed-off-by: Ankur Tyagi Signed-off-by: Anuj Mittal --- .../recipes-utils/e2tools/e2tools_0.1.2.bb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 219735acd1..b7b925da0e 100644 --- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb +++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb @@ -39,7 +39,21 @@ do_install_ptest() { ${D}${PTEST_PATH}/build/autom4te.cache \ ${D}${PTEST_PATH}/*/*/.git ${D}${PTEST_PATH}/*/*/.github \ ${D}${PTEST_PATH}/*/*/autom4te.cache - sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status + sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' \ + -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \ + -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ + -e '/EXT2FS_CFLAGS/d' \ + -e '/LDFLAGS/d' \ + -e '/PKG_CONFIG_PATH/d' \ + -e '/PKG_CONFIG_LIBDIR/d' \ + -e 's@${S}@${PTEST_PATH}@g' \ + -e 's@${B}@${PTEST_PATH}/build@g' \ + -e 's@${HOSTTOOLS_DIR}@@g' \ + -e 's@${RECIPE_SYSROOT}@@g' \ + -i ${D}${PTEST_PATH}/build/config.status } RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"