From 102fc29b9c9eae8435b29edb41b5090ace2373c5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Aug 2011 16:32:03 +0100 Subject: package_rpm: Ensure alternatives links are reflected in rpm package dependencies Currently, if a file is provided as an alternative link within the package, rpm doesn't see the dependency. This works out badly for dependencies such as /bin/sh which scripts might require. Since rpm detects and adds these dependencies we do need to ensure the dependency information in the packages is correct. This patch does so for the rpm backend ensuring internal consistency whilst the approach for addressing this problem in the other package backends is considered. Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index abedc6800..f1232292f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -501,6 +501,10 @@ python write_specfile () { splitrconflicts = bb.data.getVar('RCONFLICTS', localdata, True) 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 v1.2.3