On Wed, 2019-11-20 at 14:44 +0100, Alexander Kanavin wrote: > rpm 4.15 no longer allows it, which makes sense. > > Signed-off-by: Alexander Kanavin <[email protected]> > --- > meta/recipes-core/meta/dummy-sdk-package.inc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc > b/meta/recipes-core/meta/dummy-sdk-package.inc > index 4d653706b13..58b0482eca5 100644 > --- a/meta/recipes-core/meta/dummy-sdk-package.inc > +++ b/meta/recipes-core/meta/dummy-sdk-package.inc > @@ -16,11 +16,12 @@ python() { > ALLOW_EMPTY_${PN} = "1" > > PR[vardeps] += "DUMMYPROVIDES" > +PR[vardeps] += "DUMMYPROVIDES_PACKAGES" > > python populate_packages_prepend() { > p = d.getVar("PN") > d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") > d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") > - d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}") > + d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}") > }
This breaks: https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/1509 Needs something like this (added in -next): diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index 58b0482eca..61afab1d76 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc @@ -18,6 +18,9 @@ ALLOW_EMPTY_${PN} = "1" PR[vardeps] += "DUMMYPROVIDES" PR[vardeps] += "DUMMYPROVIDES_PACKAGES" +DUMMYPROVIDES_PACKAGES ??= "" +DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" + python populate_packages_prepend() { p = d.getVar("PN") d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index 6a8748acdf..5bc11b9daf 100644 --- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb @@ -1,6 +1,6 @@ DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" -DUMMYPROVIDES = "\ +DUMMYPROVIDES_PACKAGES = "\ nativesdk-perl \ nativesdk-libxml-parser-perl \ nativesdk-perl-module-bytes \ @@ -21,6 +21,9 @@ DUMMYPROVIDES = "\ nativesdk-perl-module-posix \ nativesdk-perl-module-thread-queue \ nativesdk-perl-module-threads \ +" + +DUMMYPROVIDES = "\ /usr/bin/perl \ " diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index b891efa5ef..29f4dd3633 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -1,10 +1,13 @@ DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" +DUMMYPROVIDES_PACKAGES = "\ + pkgconfig \ +" + # Add /bin/sh? DUMMYPROVIDES = "\ /bin/bash \ /usr/bin/env \ - pkgconfig \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 87b8bfab9c..e3beeb796c 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -48,7 +48,6 @@ DUMMYPROVIDES_PACKAGES = "\ " DUMMYPROVIDES = "\ - ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \ /bin/sh \ /bin/bash \ /usr/bin/env \ -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
