diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-20 14:44:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-28 21:13:00 +0000 |
commit | 63ad134e3d029accf67e1ba8880f59c7704cb505 (patch) | |
tree | 255c3cfe825f6d4226e721c0ce761503bc381c45 | |
parent | 7ec115d2988ed005c97e39c24689bd7a5aedce16 (diff) | |
download | poky-63ad134e3d029accf67e1ba8880f59c7704cb505.tar.gz |
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 <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/meta/dummy-sdk-package.inc | 3 |
1 files changed, 2 insertions, 1 deletions
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() { | |||
16 | ALLOW_EMPTY_${PN} = "1" | 16 | ALLOW_EMPTY_${PN} = "1" |
17 | 17 | ||
18 | PR[vardeps] += "DUMMYPROVIDES" | 18 | PR[vardeps] += "DUMMYPROVIDES" |
19 | PR[vardeps] += "DUMMYPROVIDES_PACKAGES" | ||
19 | 20 | ||
20 | DUMMYPROVIDES_PACKAGES ??= "" | 21 | DUMMYPROVIDES_PACKAGES ??= "" |
21 | DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" | 22 | DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" |
@@ -24,6 +25,6 @@ python populate_packages_prepend() { | |||
24 | p = d.getVar("PN") | 25 | p = d.getVar("PN") |
25 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") | 26 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") |
26 | d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") | 27 | d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") |
27 | d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}") | 28 | d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}") |
28 | } | 29 | } |
29 | 30 | ||