diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-03 16:32:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-03 17:40:54 +0100 |
| commit | 102fc29b9c9eae8435b29edb41b5090ace2373c5 (patch) | |
| tree | 3e10d8403df7752a0a32a213206afd353424be4d | |
| parent | 6a4778e21341f031569f561e7699d2c616b60af0 (diff) | |
| download | openembedded-core-102fc29b9c9eae8435b29edb41b5090ace2373c5.tar.gz openembedded-core-102fc29b9c9eae8435b29edb41b5090ace2373c5.tar.bz2 openembedded-core-102fc29b9c9eae8435b29edb41b5090ace2373c5.zip | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index abedc68005..f1232292f6 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 |