summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-12-01 12:37:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:48 (GMT)
commitafa57d3bc928655986d35c7c99c011c6d71932dd (patch)
treeed05b95b358aebc7839ea9f5769f699cd17705f4
parent1580cb8cefcb81fcca78edc89fb7b714f27dde24 (diff)
downloadpoky-afa57d3bc928655986d35c7c99c011c6d71932dd.tar.gz
libc-package.bbclass: split binary localedata even more if asked to
If GLIBC_SPLIT_LC_PACKAGES is set to a non-zero value, convert glibc-binary-localedata-XX-YY to be a meta package depending on glibc-binary-localedata-XX-YY-lc-address and so on. This enables saving quite some space if someone doesn't need LC_COLLATE for example. Some regex code was removed from output_locale_binary_rdepends, because legitimize_package_name already converts to lowercase. (From OE-Core rev: 40b4b31092058f8833ada3dfc254d362dd3139c1) (From OE-Core rev: d11222c452d79cc2044a21432336c4a59d08327b) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass39
1 files changed, 25 insertions, 14 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 2dc90c4..071978b 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -9,6 +9,8 @@
9 9
10GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" 10GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice"
11 11
12GLIBC_SPLIT_LC_PACKAGES ?= "0"
13
12python __anonymous () { 14python __anonymous () {
13 enabled = d.getVar("ENABLE_BINARY_LOCALE_GENERATION", True) 15 enabled = d.getVar("ENABLE_BINARY_LOCALE_GENERATION", True)
14 16
@@ -219,13 +221,12 @@ python package_do_split_gconvs () {
219 (locale, encoding, locale)) 221 (locale, encoding, locale))
220 222
221 def output_locale_binary_rdepends(name, pkgname, locale, encoding): 223 def output_locale_binary_rdepends(name, pkgname, locale, encoding):
222 m = re.match("(.*)\.(.*)", name) 224 dep = legitimize_package_name('%s-binary-localedata-%s' % (bpn, name))
223 if m: 225 lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
224 libc_name = "%s.%s" % (m.group(1), m.group(2).lower()) 226 if lcsplit and int(lcsplit):
225 else: 227 d.appendVar('PACKAGES', ' ' + dep)
226 libc_name = name 228 d.setVar('ALLOW_EMPTY_%s' % dep, '1')
227 d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ 229 d.setVar('RDEPENDS_%s' % pkgname, mlprefix + dep)
228 % (mlprefix+bpn, libc_name)))
229 230
230 commands = {} 231 commands = {}
231 232
@@ -337,6 +338,11 @@ python package_do_split_gconvs () {
337 else: 338 else:
338 output_locale('%s.%s' % (base, charset), base, charset) 339 output_locale('%s.%s' % (base, charset), base, charset)
339 340
341 def metapkg_hook(file, pkg, pattern, format, basename):
342 name = basename.split('/', 1)[0]
343 metapkg = legitimize_package_name('%s-binary-localedata-%s' % (mlprefix+bpn, name))
344 d.appendVar('RDEPENDS_%s' % metapkg, ' ' + pkg)
345
340 if use_bin == "compile": 346 if use_bin == "compile":
341 makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile") 347 makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile")
342 m = open(makefile, "w") 348 m = open(makefile, "w")
@@ -350,13 +356,18 @@ python package_do_split_gconvs () {
350 bb.build.exec_func("oe_runmake", d) 356 bb.build.exec_func("oe_runmake", d)
351 bb.note("collecting binary locales from locale tree") 357 bb.note("collecting binary locales from locale tree")
352 bb.build.exec_func("do_collect_bins_from_locale_tree", d) 358 bb.build.exec_func("do_collect_bins_from_locale_tree", d)
353 do_split_packages(d, binary_locales_dir, file_regex='(.*)', \ 359
354 output_pattern=bpn+'-binary-localedata-%s', \ 360 if use_bin in ('compile', 'precompiled'):
355 description='binary locale definition for %s', extra_depends='', allow_dirs=True) 361 lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
356 elif use_bin == "precompiled": 362 if lcsplit and int(lcsplit):
357 do_split_packages(d, binary_locales_dir, file_regex='(.*)', \ 363 do_split_packages(d, binary_locales_dir, file_regex='^(.*/LC_\w+)', \
358 output_pattern=bpn+'-binary-localedata-%s', \ 364 output_pattern=bpn+'-binary-localedata-%s', \
359 description='binary locale definition for %s', extra_depends='', allow_dirs=True) 365 description='binary locale definition for %s', recursive=True,
366 hook=metapkg_hook, extra_depends='', allow_dirs=True, match_path=True)
367 else:
368 do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
369 output_pattern=bpn+'-binary-localedata-%s', \
370 description='binary locale definition for %s', extra_depends='', allow_dirs=True)
360 else: 371 else:
361 bb.note("generation of binary locales disabled. this may break i18n!") 372 bb.note("generation of binary locales disabled. this may break i18n!")
362 373