From 63ad134e3d029accf67e1ba8880f59c7704cb505 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 20 Nov 2019 14:44:47 +0100 Subject: dummy-sdk-package.inc: do not include files into RREPLACES rpm 4.15 no longer allows it, which makes sense. (From OE-Core rev: 017d0f34619cf56dd223ba8c075af5f7e128e61b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- 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 0d15a37c35..61afab1d76 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc @@ -16,6 +16,7 @@ python() { 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()])}" @@ -24,6 +25,6 @@ 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}") } -- cgit v1.2.3-54-g00ecf