From patchwork Thu Apr 27 08:22:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "qiutt@fujitsu.com" X-Patchwork-Id: 23071 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 847B4C77B73 for ; Thu, 27 Apr 2023 08:23:01 +0000 (UTC) Subject: [PATCH V2] Fix error SRCDIR when using usrmerge DISTRO_FEATURES To: openembedded-core@lists.openembedded.org From: "qiutt@fujitsu.com" X-Originating-Location: CN (223.111.68.150) X-Originating-Platform: Windows Chrome 112 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Thu, 27 Apr 2023 01:22:58 -0700 Message-ID: List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Apr 2023 08:23:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/180486 From 3b1c081d4efffe83f3a63184450cc79bf16356dc Mon Sep 17 00:00:00 2001 From: Qiu Tingting Date: Thu, 27 Apr 2023 15:24:35 +0800 Subject: [PATCH V2] Fix error SRCDIR when using usrmerge DISTRO_FEATURES When build e2fsprogs ptest with usrmerge DISTRO_FEATURES, in test_script and test_one scripts, value of SRCDIR has problem. SRCDIR=/usr/usr/lib/e2fsprogs/ptest/test ptest log # ptest-runner e2fsprogs START: ptest-runner 2022-12-17T11:08 BEGIN: /usr/lib/e2fsprogs/ptest ls: cannot access '/usr/usr/lib/e2fsprogs/ptest/test/[a-zA-Z]_*': No such file or directory ./test_script: line 54: /usr/usr/lib/e2fsprogs/ptest/test/test_post: No such file or directory DURATION: 0 END: /usr/lib/e2fsprogs/ptest 2022-12-17T11:08 STOP: ptest-runner TOTAL: 1 FAIL: 0 Reason In Makefile.in, SRCDIR is set by prefix and libdir. @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script prefix=/usr libdir=/usr/lib (when usrmerge is set) solution After ptest compiling, check and modify SRCDIR in test_script and test_one. Signed-off-by: Qiu Tingting --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.25.1 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb index 2620610903..a2eb4f8f8f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb @@ -122,6 +122,9 @@ RDEPENDS:${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck do_compile_ptest() { oe_runmake -C ${B}/tests +       sed -i 's,/usr/usr,/usr,g' \ +           ${B}/tests/test_one \ +           ${B}/tests/test_script } do_install_ptest() {