diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-19 13:40:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-25 08:57:44 +0100 |
commit | 3694f05ef07e57e594843aa88af730ff855980cf (patch) | |
tree | 3d876a165ad41fa79d3c88eda2b4a6e5b3fc165e | |
parent | c490ba0a93be2cbf81392683a663899cca8a3670 (diff) | |
download | poky-3694f05ef07e57e594843aa88af730ff855980cf.tar.gz |
debian: Set RPROVIDES to include the original packagename when renaming
Currently its hard for a packagegroup recipe to depend on something who's name
can change unpredictably. We therefore add in RPROVIDES for the original
package name so that these are also available to use as dependencies.
(From OE-Core rev: 3409c4379559afbb1d1d29045582995147a33bbc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/debian.bbclass | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 47d3ed89d2..c859703669 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass | |||
@@ -52,6 +52,13 @@ python debian_package_name_hook () { | |||
52 | return 0 | 52 | return 0 |
53 | return (s[stat.ST_MODE] & stat.S_IEXEC) | 53 | return (s[stat.ST_MODE] & stat.S_IEXEC) |
54 | 54 | ||
55 | def add_rprovides(pkg, d): | ||
56 | newpkg = d.getVar('PKG_' + pkg) | ||
57 | if newpkg and newpkg != pkg: | ||
58 | provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split() | ||
59 | if pkg not in provs: | ||
60 | d.appendVar('RPROVIDES_' + pkg, " " + pkg) | ||
61 | |||
55 | def auto_libname(packages, orig_pkg): | 62 | def auto_libname(packages, orig_pkg): |
56 | sonames = [] | 63 | sonames = [] |
57 | has_bins = 0 | 64 | has_bins = 0 |
@@ -99,6 +106,7 @@ python debian_package_name_hook () { | |||
99 | (pkgname, devname) = soname_result | 106 | (pkgname, devname) = soname_result |
100 | for pkg in packages.split(): | 107 | for pkg in packages.split(): |
101 | if (d.getVar('PKG_' + pkg) or d.getVar('DEBIAN_NOAUTONAME_' + pkg)): | 108 | if (d.getVar('PKG_' + pkg) or d.getVar('DEBIAN_NOAUTONAME_' + pkg)): |
109 | add_rprovides(pkg, d) | ||
102 | continue | 110 | continue |
103 | debian_pn = d.getVar('DEBIANNAME_' + pkg) | 111 | debian_pn = d.getVar('DEBIANNAME_' + pkg) |
104 | if debian_pn: | 112 | if debian_pn: |
@@ -113,6 +121,9 @@ python debian_package_name_hook () { | |||
113 | newpkg = mlpre + newpkg | 121 | newpkg = mlpre + newpkg |
114 | if newpkg != pkg: | 122 | if newpkg != pkg: |
115 | d.setVar('PKG_' + pkg, newpkg) | 123 | d.setVar('PKG_' + pkg, newpkg) |
124 | add_rprovides(pkg, d) | ||
125 | else: | ||
126 | add_rprovides(orig_pkg, d) | ||
116 | 127 | ||
117 | # reversed sort is needed when some package is substring of another | 128 | # reversed sort is needed when some package is substring of another |
118 | # ie in ncurses we get without reverse sort: | 129 | # ie in ncurses we get without reverse sort: |