summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-03 15:32:03 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 01:47:59 (GMT)
commit97c908cf64c603dcc805e1ec52997ca981bb7148 (patch)
tree359aea3025e5657c6c383c552207158fbae0f6b3
parent9af5107141f8d408ccda56a94d6d469a0d7fcaea (diff)
downloadpoky-97c908cf64c603dcc805e1ec52997ca981bb7148.tar.gz
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. (From OE-Core rev: 102fc29b9c9eae8435b29edb41b5090ace2373c5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index abedc68..f123229 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -501,6 +501,10 @@ python write_specfile () {
501 splitrconflicts = bb.data.getVar('RCONFLICTS', localdata, True) or "" 501 splitrconflicts = bb.data.getVar('RCONFLICTS', localdata, True) or ""
502 splitrobsoletes = [] 502 splitrobsoletes = []
503 503
504 # For now we need to manually supplement RPROVIDES with any update-alternatives links
505 if pkg == d.getVar("PN", True):
506 splitrprovides = splitrprovides + " " + (d.getVar('ALTERNATIVE_LINK', True) or '') + " " + (d.getVar('ALTERNATIVE_LINKS', True) or '')
507
504 # Gather special src/first package data 508 # Gather special src/first package data
505 if srcname == splitname: 509 if srcname == splitname:
506 srcrdepends = splitrdepends 510 srcrdepends = splitrdepends