]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
cpio: respect MLPREFIX for PACKAGE_WRITE_DEPS
authorMartin Jansa <martin.jansa@gmail.com>
Sat, 1 Jul 2023 23:56:05 +0000 (01:56 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 10 Jul 2023 10:36:06 +0000 (11:36 +0100)
* 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 <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/cpio/cpio_2.14.bb

index e55fb70cb1c3ac0c454862f33b9bb1199cf75b3d..45eb9de8e05a71102b47677888883a65976b4078 100644 (file)
@@ -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"