diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-05-15 11:06:22 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 12:04:37 +0100 |
commit | 6ac7e9b5981872b22dcd07f0f7171e1f7c10e284 (patch) | |
tree | 4e36c4023c1358b108a4546abc60d91fdb425d57 /meta/classes/package_rpm.bbclass | |
parent | f28209d9d3c67203a2c7a2b25cacfe31643d1bfa (diff) | |
download | poky-6ac7e9b5981872b22dcd07f0f7171e1f7c10e284.tar.gz |
update-alternatives.bbclass: Refactor the implementation
Refactor in order to:
* Deprecate the old interfaces, but keep them for compatibility
* Provide a new, interface -- capable of working with split packages
* Each update-alternative will now set proper "per-file" provides
Note: this adds a warning message when the older deprecated behavior is
used. The older behavior has been fully tested using oe-core.
(From OE-Core rev: 309117d26de6a87b16406a44a0cefcbaaf7b5d7a)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index daa9db421e..35928abb91 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -706,10 +706,6 @@ python write_specfile () { | |||
706 | splitrconflicts = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or "" | 706 | splitrconflicts = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or "" |
707 | splitrobsoletes = [] | 707 | splitrobsoletes = [] |
708 | 708 | ||
709 | # For now we need to manually supplement RPROVIDES with any update-alternatives links | ||
710 | if pkg == d.getVar("PN", True): | ||
711 | splitrprovides = splitrprovides + " " + (d.getVar('ALTERNATIVE_LINK', True) or '') + " " + (d.getVar('ALTERNATIVE_LINKS', True) or '') | ||
712 | |||
713 | # Gather special src/first package data | 709 | # Gather special src/first package data |
714 | if srcname == splitname: | 710 | if srcname == splitname: |
715 | srcrdepends = splitrdepends | 711 | srcrdepends = splitrdepends |