Convert tab indentation in python functions into four-space

(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 263 insertions, 263 deletions

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 9df3c17116..e3214a68a2 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -28,10 +28,10 @@ python __anonymous () {
 
             if r.match(target_arch):
                 depends = d.getVar("DEPENDS", True)
-                if use_cross_localedef == "1" :
-                        depends = "%s cross-localedef-native" % depends
-                else:
-                        depends = "%s qemu-native" % depends
+                if use_cross_localedef == "1" :
+                    depends = "%s cross-localedef-native" % depends
+                else:
+                    depends = "%s qemu-native" % depends
                 d.setVar("DEPENDS", depends)
                 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
                 break
@@ -118,270 +118,270 @@ do_collect_bins_from_locale_tree() {
 inherit qemu
 
 python package_do_split_gconvs () {
-        import os, re
-        if (d.getVar('PACKAGE_NO_GCONV', True) == '1'):
-                bb.note("package requested not splitting gconvs")
-                return
-
-        if not d.getVar('PACKAGES', True):
-                return
-
-        mlprefix = d.getVar("MLPREFIX", True) or ""
-
-        bpn = d.getVar('BPN', True)
-        libdir = d.getVar('libdir', True)
-        if not libdir:
-                bb.error("libdir not defined")
-                return
-        datadir = d.getVar('datadir', True)
-        if not datadir:
-                bb.error("datadir not defined")
-                return
-
-        gconv_libdir = base_path_join(libdir, "gconv")
-        charmap_dir = base_path_join(datadir, "i18n", "charmaps")
-        locales_dir = base_path_join(datadir, "i18n", "locales")
-        binary_locales_dir = base_path_join(libdir, "locale")
-
-        def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group):
-                deps = []
-                f = open(fn, "r")
-                c_re = re.compile('^copy "(.*)"')
-                i_re = re.compile('^include "(\w+)".*')
-                for l in f.readlines():
-                        m = c_re.match(l) or i_re.match(l)
-                        if m:
-                                dp = legitimize_package_name('%s%s-gconv-%s' % (mlprefix, bpn, m.group(1)))
-                                if not dp in deps:
-                                        deps.append(dp)
-                f.close()
-                if deps != []:
-                        d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
-                if bpn != 'glibc':
-                        d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
-
-        do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \
-                description='gconv module for character set %s', hook=calc_gconv_deps, \
-                extra_depends=bpn+'-gconv')
-
-        def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group):
-                deps = []
-                f = open(fn, "r")
-                c_re = re.compile('^copy "(.*)"')
-                i_re = re.compile('^include "(\w+)".*')
-                for l in f.readlines():
-                        m = c_re.match(l) or i_re.match(l)
-                        if m:
-                                dp = legitimize_package_name('%s%s-charmap-%s' % (mlprefix, bpn, m.group(1)))
-                                if not dp in deps:
-                                        deps.append(dp)
-                f.close()
-                if deps != []:
-                        d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
-                if bpn != 'glibc':
-                        d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
-
-        do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern=bpn+'-charmap-%s', \
-                description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='')
-
-        def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
-                deps = []
-                f = open(fn, "r")
-                c_re = re.compile('^copy "(.*)"')
-                i_re = re.compile('^include "(\w+)".*')
-                for l in f.readlines():
-                        m = c_re.match(l) or i_re.match(l)
-                        if m:
-                                dp = legitimize_package_name(mlprefix+bpn+'-localedata-%s' % m.group(1))
-                                if not dp in deps:
-                                        deps.append(dp)
-                f.close()
-                if deps != []:
-                        d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
-                if bpn != 'glibc':
-                        d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
-
-        do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \
-                description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
-        d.setVar('PACKAGES', d.getVar('PACKAGES') + ' ' + d.getVar('MLPREFIX') + bpn + '-gconv')
-
-        use_bin = d.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", True)
-
-        dot_re = re.compile("(.*)\.(.*)")
-
-        # Read in supported locales and associated encodings
-        supported = {}
-        with open(base_path_join(d.getVar('WORKDIR', True), "SUPPORTED")) as f:
-                for line in f.readlines():
-                        try:
-                                locale, charset = line.rstrip().split()
-                        except ValueError:
-                                continue
-                        supported[locale] = charset
-
-        # GLIBC_GENERATE_LOCALES var specifies which locales to be generated. empty or "all" means all locales
-        to_generate = d.getVar('GLIBC_GENERATE_LOCALES', True)
-        if not to_generate or to_generate == 'all':
-                to_generate = supported.keys()
-        else:
-                to_generate = to_generate.split()
-                for locale in to_generate:
-                        if locale not in supported:
-                                if '.' in locale:
-                                        charset = locale.split('.')[1]
-                                else:
-                                        charset = 'UTF-8'
-                                        bb.warn("Unsupported locale '%s', assuming encoding '%s'" % (locale, charset))
-                                supported[locale] = charset
-
-        def output_locale_source(name, pkgname, locale, encoding):
-                d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \
-                (mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding)))
-                d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \
-                % (locale, encoding, locale))
-                d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \
-                (locale, encoding, locale))
-
-        def output_locale_binary_rdepends(name, pkgname, locale, encoding):
-                m = re.match("(.*)\.(.*)", name)
-                if m:
-                        libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
-                else:
-                        libc_name = name
-                d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-                        % (mlprefix+bpn, libc_name)))
-
-        commands = {}
-
-        def output_locale_binary(name, pkgname, locale, encoding):
-                treedir = base_path_join(d.getVar("WORKDIR", True), "locale-tree")
-                ldlibdir = base_path_join(treedir, d.getVar("base_libdir", True))
-                path = d.getVar("PATH", True)
-                i18npath = base_path_join(treedir, datadir, "i18n")
-                gconvpath = base_path_join(treedir, "iconvdata")
-                outputpath = base_path_join(treedir, libdir, "locale")
-
-                use_cross_localedef = d.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", True) or "0"
-                if use_cross_localedef == "1":
-                        target_arch = d.getVar('TARGET_ARCH', True)
-                        locale_arch_options = { \
-                                "arm":     " --uint32-align=4 --little-endian ", \
-                                "sh4":     " --uint32-align=4 --big-endian ",    \
-                                "powerpc": " --uint32-align=4 --big-endian ",    \
-                                "powerpc64": " --uint32-align=4 --big-endian ",  \
-                                "mips":    " --uint32-align=4 --big-endian ",    \
-                                "mips64":  " --uint32-align=4 --big-endian ",    \
-                                "mipsel":  " --uint32-align=4 --little-endian ", \
-                                "mips64el":" --uint32-align=4 --little-endian ", \
-                                "i586":    " --uint32-align=4 --little-endian ", \
-                                "i686":    " --uint32-align=4 --little-endian ", \
-                                "x86_64":  " --uint32-align=4 --little-endian "  }
-
-                        if target_arch in locale_arch_options:
-                                localedef_opts = locale_arch_options[target_arch]
-                        else:
-                                bb.error("locale_arch_options not found for target_arch=" + target_arch)
-                                raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
-
-                        localedef_opts += " --force --old-style --no-archive --prefix=%s \
-                                --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
-                                % (treedir, treedir, datadir, locale, encoding, outputpath, name)
-
-                        cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \
-                                (path, i18npath, gconvpath, localedef_opts)
-                else: # earlier slower qemu way 
-                        qemu = qemu_target_binary(d) 
-                        localedef_opts = "--force --old-style --no-archive --prefix=%s \
-                                --inputfile=%s/i18n/locales/%s --charmap=%s %s" \
-                                % (treedir, datadir, locale, encoding, name)
-
-                        qemu_options = d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True)
-                        if not qemu_options:
-                                qemu_options = d.getVar('QEMU_OPTIONS', True)
-
-                        cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
-                                -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \
-                                (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts)
-
-                commands["%s/%s" % (outputpath, name)] = cmd
-
-                bb.note("generating locale %s (%s)" % (locale, encoding))
-
-        def output_locale(name, locale, encoding):
-                pkgname = d.getVar('MLPREFIX') + 'locale-base-' + legitimize_package_name(name)
-                d.setVar('ALLOW_EMPTY_%s' % pkgname, '1')
-                d.setVar('PACKAGES', '%s %s' % (pkgname, d.getVar('PACKAGES', True)))
-                rprovides = ' %svirtual-locale-%s' % (mlprefix, legitimize_package_name(name))
-                m = re.match("(.*)_(.*)", name)
-                if m:
-                        rprovides += ' %svirtual-locale-%s' % (mlprefix, m.group(1))
-                d.setVar('RPROVIDES_%s' % pkgname, rprovides)
-
-                if use_bin == "compile":
-                        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, pkgname, locale, encoding)
-
-        if use_bin == "compile":
-                bb.note("preparing tree for binary locale generation")
-                bb.build.exec_func("do_prep_locale_tree", d)
-
-        utf8_only = int(d.getVar('LOCALE_UTF8_ONLY', True) or 0)
-        encodings = {}
-        for locale in to_generate:
-                charset = supported[locale]
-                if utf8_only and charset != 'UTF-8':
-                        continue
-
-                m = dot_re.match(locale)
-                if m:
-                        base = m.group(1)
-                else:
-                        base = locale
-
-                # Precompiled locales are kept as is, obeying SUPPORTED, while
-                # others are adjusted, ensuring that the non-suffixed locales
-                # are utf-8, while the suffixed are not.
-                if use_bin == "precompiled":
-                        output_locale(locale, base, charset)
-                else:
-                        if charset == 'UTF-8':
-                                output_locale(base, base, charset)
-                        else:
-                                output_locale('%s.%s' % (base, charset), base, charset)
-
-        if use_bin == "compile":
-                makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile")
-                m = open(makefile, "w")
-                m.write("all: %s\n\n" % " ".join(commands.keys()))
-                for cmd in commands:
-                        m.write(cmd + ":\n")
-                        m.write("       " + commands[cmd] + "\n\n")
-                m.close()
-                d.setVar("B", os.path.dirname(makefile))
-                d.setVar("EXTRA_OEMAKE", "${PARALLEL_MAKE}")
-                bb.note("Executing binary locale generation makefile")
-                bb.build.exec_func("oe_runmake", d)
-                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=bpn+'-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=bpn+'-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!")
+    import os, re
+    if (d.getVar('PACKAGE_NO_GCONV', True) == '1'):
+        bb.note("package requested not splitting gconvs")
+        return
+
+    if not d.getVar('PACKAGES', True):
+        return
+
+    mlprefix = d.getVar("MLPREFIX", True) or ""
+
+    bpn = d.getVar('BPN', True)
+    libdir = d.getVar('libdir', True)
+    if not libdir:
+        bb.error("libdir not defined")
+        return
+    datadir = d.getVar('datadir', True)
+    if not datadir:
+        bb.error("datadir not defined")
+        return
+
+    gconv_libdir = base_path_join(libdir, "gconv")
+    charmap_dir = base_path_join(datadir, "i18n", "charmaps")
+    locales_dir = base_path_join(datadir, "i18n", "locales")
+    binary_locales_dir = base_path_join(libdir, "locale")
+
+    def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group):
+        deps = []
+        f = open(fn, "r")
+        c_re = re.compile('^copy "(.*)"')
+        i_re = re.compile('^include "(\w+)".*')
+        for l in f.readlines():
+            m = c_re.match(l) or i_re.match(l)
+            if m:
+                dp = legitimize_package_name('%s%s-gconv-%s' % (mlprefix, bpn, m.group(1)))
+                if not dp in deps:
+                    deps.append(dp)
+        f.close()
+        if deps != []:
+            d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
+        if bpn != 'glibc':
+            d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
+
+    do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \
+        description='gconv module for character set %s', hook=calc_gconv_deps, \
+        extra_depends=bpn+'-gconv')
+
+    def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group):
+        deps = []
+        f = open(fn, "r")
+        c_re = re.compile('^copy "(.*)"')
+        i_re = re.compile('^include "(\w+)".*')
+        for l in f.readlines():
+            m = c_re.match(l) or i_re.match(l)
+            if m:
+                dp = legitimize_package_name('%s%s-charmap-%s' % (mlprefix, bpn, m.group(1)))
+                if not dp in deps:
+                    deps.append(dp)
+        f.close()
+        if deps != []:
+            d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
+        if bpn != 'glibc':
+            d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
+
+    do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern=bpn+'-charmap-%s', \
+        description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='')
+
+    def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
+        deps = []
+        f = open(fn, "r")
+        c_re = re.compile('^copy "(.*)"')
+        i_re = re.compile('^include "(\w+)".*')
+        for l in f.readlines():
+            m = c_re.match(l) or i_re.match(l)
+            if m:
+                dp = legitimize_package_name(mlprefix+bpn+'-localedata-%s' % m.group(1))
+                if not dp in deps:
+                    deps.append(dp)
+        f.close()
+        if deps != []:
+            d.setVar('RDEPENDS_%s' % pkg, " ".join(deps))
+        if bpn != 'glibc':
+            d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'))
+
+    do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \
+        description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
+    d.setVar('PACKAGES', d.getVar('PACKAGES') + ' ' + d.getVar('MLPREFIX') + bpn + '-gconv')
+
+    use_bin = d.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", True)
+
+    dot_re = re.compile("(.*)\.(.*)")
+
+    # Read in supported locales and associated encodings
+    supported = {}
+    with open(base_path_join(d.getVar('WORKDIR', True), "SUPPORTED")) as f:
+        for line in f.readlines():
+            try:
+                locale, charset = line.rstrip().split()
+            except ValueError:
+                continue
+            supported[locale] = charset
+
+    # GLIBC_GENERATE_LOCALES var specifies which locales to be generated. empty or "all" means all locales
+    to_generate = d.getVar('GLIBC_GENERATE_LOCALES', True)
+    if not to_generate or to_generate == 'all':
+        to_generate = supported.keys()
+    else:
+        to_generate = to_generate.split()
+        for locale in to_generate:
+            if locale not in supported:
+                if '.' in locale:
+                    charset = locale.split('.')[1]
+                else:
+                    charset = 'UTF-8'
+                    bb.warn("Unsupported locale '%s', assuming encoding '%s'" % (locale, charset))
+                supported[locale] = charset
+
+    def output_locale_source(name, pkgname, locale, encoding):
+        d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \
+        (mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding)))
+        d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \
+        % (locale, encoding, locale))
+        d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \
+        (locale, encoding, locale))
+
+    def output_locale_binary_rdepends(name, pkgname, locale, encoding):
+        m = re.match("(.*)\.(.*)", name)
+        if m:
+            libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+        else:
+            libc_name = name
+        d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
+            % (mlprefix+bpn, libc_name)))
+
+    commands = {}
+
+    def output_locale_binary(name, pkgname, locale, encoding):
+        treedir = base_path_join(d.getVar("WORKDIR", True), "locale-tree")
+        ldlibdir = base_path_join(treedir, d.getVar("base_libdir", True))
+        path = d.getVar("PATH", True)
+        i18npath = base_path_join(treedir, datadir, "i18n")
+        gconvpath = base_path_join(treedir, "iconvdata")
+        outputpath = base_path_join(treedir, libdir, "locale")
+
+        use_cross_localedef = d.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", True) or "0"
+        if use_cross_localedef == "1":
+            target_arch = d.getVar('TARGET_ARCH', True)
+            locale_arch_options = { \
+                "arm":     " --uint32-align=4 --little-endian ", \
+                "sh4":     " --uint32-align=4 --big-endian ",    \
+                "powerpc": " --uint32-align=4 --big-endian ",    \
+                "powerpc64": " --uint32-align=4 --big-endian ",  \
+                "mips":    " --uint32-align=4 --big-endian ",    \
+                "mips64":  " --uint32-align=4 --big-endian ",    \
+                "mipsel":  " --uint32-align=4 --little-endian ", \
+                "mips64el":" --uint32-align=4 --little-endian ", \
+                "i586":    " --uint32-align=4 --little-endian ", \
+                "i686":    " --uint32-align=4 --little-endian ", \
+                "x86_64":  " --uint32-align=4 --little-endian "  }
+
+            if target_arch in locale_arch_options:
+                localedef_opts = locale_arch_options[target_arch]
+            else:
+                bb.error("locale_arch_options not found for target_arch=" + target_arch)
+                raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
+
+            localedef_opts += " --force --old-style --no-archive --prefix=%s \
+                --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
+                % (treedir, treedir, datadir, locale, encoding, outputpath, name)
+
+            cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \
+                (path, i18npath, gconvpath, localedef_opts)
+        else: # earlier slower qemu way 
+            qemu = qemu_target_binary(d) 
+            localedef_opts = "--force --old-style --no-archive --prefix=%s \
+                --inputfile=%s/i18n/locales/%s --charmap=%s %s" \
+                % (treedir, datadir, locale, encoding, name)
+
+            qemu_options = d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True)
+            if not qemu_options:
+                qemu_options = d.getVar('QEMU_OPTIONS', True)
+
+            cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
+                -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \
+                (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts)
+
+        commands["%s/%s" % (outputpath, name)] = cmd
+
+        bb.note("generating locale %s (%s)" % (locale, encoding))
+
+    def output_locale(name, locale, encoding):
+        pkgname = d.getVar('MLPREFIX') + 'locale-base-' + legitimize_package_name(name)
+        d.setVar('ALLOW_EMPTY_%s' % pkgname, '1')
+        d.setVar('PACKAGES', '%s %s' % (pkgname, d.getVar('PACKAGES', True)))
+        rprovides = ' %svirtual-locale-%s' % (mlprefix, legitimize_package_name(name))
+        m = re.match("(.*)_(.*)", name)
+        if m:
+            rprovides += ' %svirtual-locale-%s' % (mlprefix, m.group(1))
+        d.setVar('RPROVIDES_%s' % pkgname, rprovides)
+
+        if use_bin == "compile":
+            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, pkgname, locale, encoding)
+
+    if use_bin == "compile":
+        bb.note("preparing tree for binary locale generation")
+        bb.build.exec_func("do_prep_locale_tree", d)
+
+    utf8_only = int(d.getVar('LOCALE_UTF8_ONLY', True) or 0)
+    encodings = {}
+    for locale in to_generate:
+        charset = supported[locale]
+        if utf8_only and charset != 'UTF-8':
+            continue
+
+        m = dot_re.match(locale)
+        if m:
+            base = m.group(1)
+        else:
+            base = locale
+
+        # Precompiled locales are kept as is, obeying SUPPORTED, while
+        # others are adjusted, ensuring that the non-suffixed locales
+        # are utf-8, while the suffixed are not.
+        if use_bin == "precompiled":
+            output_locale(locale, base, charset)
+        else:
+            if charset == 'UTF-8':
+                output_locale(base, base, charset)
+            else:
+                output_locale('%s.%s' % (base, charset), base, charset)
+
+    if use_bin == "compile":
+        makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile")
+        m = open(makefile, "w")
+        m.write("all: %s\n\n" % " ".join(commands.keys()))
+        for cmd in commands:
+            m.write(cmd + ":\n")
+            m.write("\t" + commands[cmd] + "\n\n")
+        m.close()
+        d.setVar("B", os.path.dirname(makefile))
+        d.setVar("EXTRA_OEMAKE", "${PARALLEL_MAKE}")
+        bb.note("Executing binary locale generation makefile")
+        bb.build.exec_func("oe_runmake", d)
+        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=bpn+'-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=bpn+'-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!")
 
 }
 
 # We want to do this indirection so that we can safely 'return'
 # from the called function even though we're prepending
 python populate_packages_prepend () {
-        bb.build.exec_func('package_do_split_gconvs', d)
+    bb.build.exec_func('package_do_split_gconvs', d)
 }