From: Martin Jansa Date: Sat, 1 Jul 2023 23:56:05 +0000 (+0200) Subject: cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~438 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c74697e194fe07cb4a2fee45142ae626996fd294;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS * unlike DEPENDS/RDEPENDS the PACKAGE_WRITE_DEPS dependency isn't automatically extended with MLPREFIX, causing lib32-cpio to depend on 64bit ptest-runner (and all its deps) * append it only for class-target to avoid nativesdk-cpio depending on target ptest-runner (before this patch) and depending on non-existent nativesdk-ptest-runner with this patch (as nativesdk.bbclass sets MLPREFIX to "nativesdk-") stdio: WARNING: Nothing PROVIDES 'nativesdk-ptest-runner'. Close matches: stdio: WARNING: Nothing RPROVIDES 'nativesdk-cpio' (but virtual:nativesdk:/home/pokybuild/yocto-worker/a-full/build/meta/recipes-extended/cpio/cpio_2.14.bb RDEPENDS on or otherwise requires it) stdio: WARNING: Nothing RPROVIDES 'nativesdk-cpio-dev' (but virtual:nativesdk:/home/pokybuild/yocto-worker/a-full/build/meta/recipes-extended/cpio/cpio_2.14.bb RDEPENDS on or otherwise requires it) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb index e55fb70cb1c..45eb9de8e05 100644 --- a/meta/recipes-extended/cpio/cpio_2.14.bb +++ b/meta/recipes-extended/cpio/cpio_2.14.bb @@ -66,7 +66,7 @@ do_install_ptest_base:append() { # The tests need to run as a non-root user, so pull in the ptest user DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS += "ptest-runner" +PACKAGE_WRITE_DEPS:append:class-target = " ${MLPREFIX}ptest-runner" RDEPENDS:${PN}-ptest += "ptest-runner"