diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-23 16:48:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-09 21:42:52 +0100 |
commit | 9e2638240db693b171cd8847b6c019a7047c2a1a (patch) | |
tree | feabde3e96affc07b9c00d13719ce35a71493c72 /meta/classes/libc-package.bbclass | |
parent | c77298120cbeebaaa619f1daca90a2d298240628 (diff) | |
download | poky-9e2638240db693b171cd8847b6c019a7047c2a1a.tar.gz |
libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDS
We need to add MLPREFIX when set RDEPENDS by setVar() function.
(From OE-Core rev: 9407895c88e46490d0ef9bb185f73466e7204c15)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/libc-package.bbclass')
-rw-r--r-- | meta/classes/libc-package.bbclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 51edba2e3f..57b6fd98f7 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -126,6 +126,8 @@ python package_do_split_gconvs () { | |||
126 | if not d.getVar('PACKAGES', True): | 126 | if not d.getVar('PACKAGES', True): |
127 | return | 127 | return |
128 | 128 | ||
129 | mlprefix = d.getVar("MLPREFIX", True) or "" | ||
130 | |||
129 | bpn = d.getVar('BPN', True) | 131 | bpn = d.getVar('BPN', True) |
130 | libdir = d.getVar('libdir', True) | 132 | libdir = d.getVar('libdir', True) |
131 | if not libdir: | 133 | if not libdir: |
@@ -149,7 +151,7 @@ python package_do_split_gconvs () { | |||
149 | for l in f.readlines(): | 151 | for l in f.readlines(): |
150 | m = c_re.match(l) or i_re.match(l) | 152 | m = c_re.match(l) or i_re.match(l) |
151 | if m: | 153 | if m: |
152 | dp = legitimize_package_name('%s-gconv-%s' % (bpn, m.group(1))) | 154 | dp = legitimize_package_name('%s%s-gconv-%s' % (mlprefix, bpn, m.group(1))) |
153 | if not dp in deps: | 155 | if not dp in deps: |
154 | deps.append(dp) | 156 | deps.append(dp) |
155 | f.close() | 157 | f.close() |
@@ -170,7 +172,7 @@ python package_do_split_gconvs () { | |||
170 | for l in f.readlines(): | 172 | for l in f.readlines(): |
171 | m = c_re.match(l) or i_re.match(l) | 173 | m = c_re.match(l) or i_re.match(l) |
172 | if m: | 174 | if m: |
173 | dp = legitimize_package_name('%s-charmap-%s' % (bpn, m.group(1))) | 175 | dp = legitimize_package_name('%s%s-charmap-%s' % (mlprefix, bpn, m.group(1))) |
174 | if not dp in deps: | 176 | if not dp in deps: |
175 | deps.append(dp) | 177 | deps.append(dp) |
176 | f.close() | 178 | f.close() |
@@ -190,7 +192,7 @@ python package_do_split_gconvs () { | |||
190 | for l in f.readlines(): | 192 | for l in f.readlines(): |
191 | m = c_re.match(l) or i_re.match(l) | 193 | m = c_re.match(l) or i_re.match(l) |
192 | if m: | 194 | if m: |
193 | dp = legitimize_package_name(bpn+'-localedata-%s' % m.group(1)) | 195 | dp = legitimize_package_name(mlprefix+bpn+'-localedata-%s' % m.group(1)) |
194 | if not dp in deps: | 196 | if not dp in deps: |
195 | deps.append(dp) | 197 | deps.append(dp) |
196 | f.close() | 198 | f.close() |
@@ -234,7 +236,7 @@ python package_do_split_gconvs () { | |||
234 | 236 | ||
235 | def output_locale_source(name, pkgname, locale, encoding): | 237 | def output_locale_source(name, pkgname, locale, encoding): |
236 | d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \ | 238 | d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \ |
237 | (bpn, legitimize_package_name(locale), bpn, legitimize_package_name(encoding))) | 239 | (mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding))) |
238 | d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \ | 240 | d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \ |
239 | % (locale, encoding, locale)) | 241 | % (locale, encoding, locale)) |
240 | d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \ | 242 | d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \ |
@@ -247,7 +249,7 @@ python package_do_split_gconvs () { | |||
247 | else: | 249 | else: |
248 | libc_name = name | 250 | libc_name = name |
249 | d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ | 251 | d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ |
250 | % (d.getVar('MLPREFIX') + bpn, libc_name))) | 252 | % (mlprefix+bpn, libc_name))) |
251 | 253 | ||
252 | commands = {} | 254 | commands = {} |
253 | 255 | ||