From 309117d26de6a87b16406a44a0cefcbaaf7b5d7a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 15 May 2012 11:06:22 -0500 Subject: 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. Signed-off-by: Mark Hatle --- meta/classes/package_rpm.bbclass | 4 ---- 1 file changed, 4 deletions(-) (limited to 'meta/classes/package_rpm.bbclass') 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 () { splitrconflicts = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or "" splitrobsoletes = [] - # For now we need to manually supplement RPROVIDES with any update-alternatives links - if pkg == d.getVar("PN", True): - splitrprovides = splitrprovides + " " + (d.getVar('ALTERNATIVE_LINK', True) or '') + " " + (d.getVar('ALTERNATIVE_LINKS', True) or '') - # Gather special src/first package data if srcname == splitname: srcrdepends = splitrdepends -- cgit 1.2.3-korg