From d8259c30aaf4392a97ddcc7b9727d3097e8826f0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 13 Jul 2025 22:08:32 -0700 Subject: [PATCH] e2tools: Do not hardcode 'git' as part of path in ptests Before S was not inside UNPACKDIR and default path for recipes using git fetcher would be in WORKDIR/git but it has changed now recently after S moved inside UNPACKDIR the name of source folder is no more 'git', use wildcard to find the files to delete Fixes ERROR: e2tools-0.1.2-r0 do_package_qa: QA Issue: /usr/lib/e2tools/ptest/e2tools-0.1.2/.git/hooks/update.sample contained in package e2tools-ptest requires /usr/bin/sh, but no providers found in RDEPENDS:e2tools-ptest? [file-rdeps] Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 a60fbec821..38fa8b439e 100644 --- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb +++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb @@ -35,10 +35,11 @@ do_install_ptest() { cp -r ../build "${D}${PTEST_PATH}" cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build" cp -r "${S}" "${D}${PTEST_PATH}" - rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ - ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache + rm -rf ${D}${PTEST_PATH}/build/config.log \ + ${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 -i -e 's;${STAGING_DIR_NATIVE};;g' ${D}${PTEST_PATH}/${BP}/autom4te.cache/* } RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"