glibc-package.bbclass: Add support for precompiled glibc trees (from Poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass
index 828c08a..413ed14 100644 (file)
--- a/classes/glibc-package.bbclass
+++ b/classes/glibc-package.bbclass
@@ -160,17 +160,29 @@ python package_do_split_gconvs () {
        do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
        bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d)
 
-       supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
-       if not supported or supported == "all":
-           f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
-           supported = f.readlines()
-           f.close()
-       else:
-           supported = supported.split()
-           supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+       use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
 
        dot_re = re.compile("(.*)\.(.*)")
 
+       if use_bin != "precompiled":
+               supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
+               if not supported or supported == "all":
+                   f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+                   supported = f.readlines()
+                   f.close()
+               else:
+                   supported = supported.split()
+                   supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+       else:
+               supported = []
+               full_bin_path = bb.data.getVar('PKGD', d, True) + binary_locales_dir
+               for dir in os.listdir(full_bin_path):
+                       dbase = dir.split(".")
+                       d2 = "  "
+                       if len(dbase) > 1:
+                               d2 = "." + dbase[1].upper() + "  "
+                       supported.append(dbase[0] + d2)
+
        # Collate the locales by base and encoding
        utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0)
        encodings = {}
@@ -186,21 +198,20 @@ python package_do_split_gconvs () {
                        encodings[locale] = []
                encodings[locale].append(charset)
 
-       def output_locale_source(name, locale, encoding):
-               pkgname = 'locale-base-' + legitimize_package_name(name)
-
+       def output_locale_source(name, pkgname, locale, encoding):
                bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
-               rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-               m = re.match("(.*)_(.*)", name)
-               if m:
-                       rprovides += ' virtual-locale-%s' % m.group(1)
-               bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-               bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
-               bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
                bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
                bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
 
-       def output_locale_binary(name, locale, encoding):
+       def output_locale_binary_rdepends(name, pkgname, locale, encoding):
+               m = re.match("(.*)\.(.*)", name)
+               if m:
+                       glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+               else:
+                       glibc_name = name
+               bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
+
+       def output_locale_binary(name, pkgname, locale, encoding):
                target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
                if target_arch in ("i486", "i586", "i686"):
                        target_arch = "i386"
@@ -220,19 +231,6 @@ python package_do_split_gconvs () {
                else:
                        qemu = "qemu-%s  -s 1048576 -r %s" % (target_arch, kernel_ver)
                pkgname = 'locale-base-' + legitimize_package_name(name)
-               m = re.match("(.*)\.(.*)", name)
-               if m:
-                       glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
-               else:
-                       glibc_name = name
-               bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
-               rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-               m = re.match("(.*)_(.*)", name)
-               if m:
-                       rprovides += ' virtual-locale-%s' % m.group(1)
-               bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-               bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
-               bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
 
                treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
                ldlibdir = "%s/lib" % treedir
@@ -251,13 +249,22 @@ python package_do_split_gconvs () {
                        raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
 
        def output_locale(name, locale, encoding):
-               use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+               pkgname = 'locale-base-' + legitimize_package_name(name)
+               bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+               bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+               rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+               m = re.match("(.*)_(.*)", name)
+               if m:
+                       rprovides += ' virtual-locale-%s' % m.group(1)
+               bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
                if use_bin == "compile":
-                       output_locale_binary(name, locale, encoding)
+                       output_locale_binary_rdepends(name, pkgname, locale, encoding)
+                       output_locale_binary(name, pkgname, locale, encoding)
+               elif use_bin == "precompiled":
+                       output_locale_binary_rdepends(name, pkgname, locale, encoding)
                else:
-                       output_locale_source(name, locale, encoding)
+                       output_locale_source(name, pkgname, locale, encoding)
 
-       use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
        if use_bin == "compile":
                bb.note("preparing tree for binary locale generation")
                bb.build.exec_func("do_prep_locale_tree", d)
@@ -278,15 +285,16 @@ python package_do_split_gconvs () {
                        for e in encodings[l]:
                                output_locale('%s.%s' % (l, e), l, e)
 
-       if non_utf8 != []:
+       if non_utf8 != [] and use_bin != "precompiled":
                bb.note("the following locales are supported only in legacy encodings:")
                bb.note("  " + " ".join(non_utf8))
 
-       use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
        if use_bin == "compile":
                bb.note("collecting binary locales from locale tree")
                bb.build.exec_func("do_collect_bins_from_locale_tree", d)
                do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
+       elif use_bin == "precompiled":
+               do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
        else:
                bb.note("generation of binary locales disabled. this may break i18n!")