Major layout change to the packages directory

Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

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

1 files changed, 381 insertions, 0 deletions

diff --git a/meta/recipes-core/eglibc/eglibc-package.bbclass b/meta/recipes-core/eglibc/eglibc-package.bbclass
new file mode 100644
index 0000000000..4e286afa80
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-package.bbclass
@@ -0,0 +1,381 @@
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a eglibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+inherit qemu
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+
+# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
+# is set. The idea is to avoid running localedef on the target (at first boot)
+# to decrease initial boot time and avoid localedef being killed by the OOM
+# killer which used to effectively break i18n on machines with < 128MB RAM.
+
+# default to disabled until qemu works for everyone
+ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+
+# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc"
+
+# Set this to zero if you don't want ldconfig in the output package
+USE_LDCONFIG ?= "1"
+
+PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
+
+RPROVIDES_eglibc = "glibc"
+RPROVIDES_eglibc-utils = "glibc-utils"
+RPROVIDES_eglibc-pic = "glibc-pic"
+RPROVIDES_eglibc-dev = "glibc-dev"
+RPROVIDES_eglibc-doc = "glibc-doc"
+RPROVIDES_eglibc-locale = "glibc-locale"
+RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
+RPROVIDES_eglibc-thread-db = "glibc-thread-db"
+RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-dbg = "glibc-dbg"
+libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
+
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "${base_libdir}/libSegFault*"
+FILES_libcidn = "${base_libdir}/libcidn*.so"
+FILES_libmemusage = "${base_libdir}/libmemusage.so"
+FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
+FILES_sln = "/sbin/sln"
+FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
+        ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
+FILES_eglibc-gconv = "${libdir}/gconv/*"
+FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug"
+FILES_catchsegv = "${bindir}/catchsegv"
+RDEPENDS_catchsegv = "libsegfault"
+FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so"
+FILES_eglibc-thread-db = "${base_libdir}/libthread_db*"
+FILES_localedef = "${bindir}/localedef"
+RPROVIDES_eglibc-dev += "libc-dev"
+
+DESCRIPTION_sln = "eglibc: create symbolic links between files"
+DESCRIPTION_nscd = "eglibc: name service cache daemon for passwd, group, and hosts"
+DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services"
+DESCRIPTION_ldd = "eglibc: print shared library dependencies"
+DESCRIPTION_localedef = "eglibc: compile locale definition files"
+DESCRIPTION_eglibc-utils = "eglibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
+
+def get_eglibc_fpu_setting(bb, d):
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--without-fp"
+    return ""
+
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
+
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+
+do_configure_prepend() {
+        sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
+}
+
+do_install() {
+        oe_runmake install_root=${D} install
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+        done
+        install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+        install -d ${D}${libdir}/locale
+        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+        # get rid of some broken files...
+        for i in ${GLIBC_BROKEN_LOCALES}; do
+                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+        done
+        rm -f ${D}/etc/rpc
+        rm -rf ${D}${datadir}/zoneinfo
+        rm -rf ${D}${libexecdir}/getconf
+}
+
+TMP_LOCALE="/tmp/locale${libdir}/locale"
+
+locale_base_postinst() {
+#!/bin/sh
+
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+        cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mkdir -p ${libdir}/locale/
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+locale_base_postrm() {
+#!/bin/sh
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+        cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+python __anonymous () {
+    enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+
+    if enabled and int(enabled):
+        import re
+
+        target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+        binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
+
+        for regexp in binary_arches.split(" "):
+            r = re.compile(regexp)
+
+            if r.match(target_arch):
+                depends = bb.data.getVar("DEPENDS", d, 1)
+                depends = "%s qemu-native" % depends
+                bb.data.setVar("DEPENDS", depends, d)
+                bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d)
+                break
+}
+
+do_prep_locale_tree() {
+        treedir=${WORKDIR}/locale-tree
+        rm -rf $treedir
+        mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
+        cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n
+        # unzip to avoid parsing errors
+        for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
+                gunzip $i
+        done
+        ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+        if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* ]; then
+                cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+        fi
+        install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin
+}
+
+do_collect_bins_from_locale_tree() {
+        treedir=${WORKDIR}/locale-tree
+
+        mkdir -p ${PKGD}${libdir}
+        cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir}
+}
+
+python package_do_split_gconvs () {
+        import os, re
+        if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
+                bb.note("package requested not splitting gconvs")
+                return
+
+        if not bb.data.getVar('PACKAGES', d, 1):
+                return
+
+        libdir = bb.data.getVar('libdir', d, 1)
+        if not libdir:
+                bb.error("libdir not defined")
+                return
+        datadir = bb.data.getVar('datadir', d, 1)
+        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('eglibc-gconv-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', hook=calc_gconv_deps, extra_depends='eglibc-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('eglibc-charmap-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-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('eglibc-localedata-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
+        bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-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)
+
+        dot_re = re.compile("(.*)\.(.*)")
+
+        # Collate the locales by base and encoding
+        encodings = {}
+        for l in supported:
+                l = l[:-1]
+                (locale, charset) = l.split(" ")
+                m = dot_re.match(locale)
+                if m:
+                        locale = m.group(1)
+                if not encodings.has_key(locale):
+                        encodings[locale] = []
+                encodings[locale].append(charset)
+
+        def output_locale_source(name, locale, encoding):
+                pkgname = 'locale-base-' + legitimize_package_name(name)
+
+                bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef eglibc-localedata-%s eglibc-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):
+                qemu = qemu_target_binary(d) + " -s 1048576"
+                kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
+                if kernel_ver:
+                        qemu += " -r %s" % (kernel_ver)
+                pkgname = 'locale-base-' + legitimize_package_name(name)
+                m = re.match("(.*)\.(.*)", name)
+                if m:
+                        eglibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+                else:
+                        eglibc_name = name
+                bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+                bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % eglibc_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
+                path = bb.data.getVar("PATH", d, 1)
+                i18npath = base_path_join(treedir, datadir, "i18n")
+
+                localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
+                cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, treedir, localedef_opts)
+                bb.note("generating locale %s (%s)" % (locale, encoding))
+                if os.system(cmd):
+                        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)
+                if use_bin:
+                        output_locale_binary(name, locale, encoding)
+                else:
+                        output_locale_source(name, locale, encoding)
+
+        use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+        if use_bin:
+                bb.note("preparing tree for binary locale generation")
+                bb.build.exec_func("do_prep_locale_tree", d)
+
+        # Reshuffle names so that UTF-8 is preferred over other encodings
+        non_utf8 = []
+        for l in encodings.keys():
+                if len(encodings[l]) == 1:
+                        output_locale(l, l, encodings[l][0])
+                        if encodings[l][0] != "UTF-8":
+                                non_utf8.append(l)
+                else:
+                        if "UTF-8" in encodings[l]:
+                                output_locale(l, l, "UTF-8")
+                                encodings[l].remove("UTF-8")
+                        else:
+                                non_utf8.append(l)
+                        for e in encodings[l]:
+                                output_locale('%s.%s' % (l, e), l, e)
+
+        if non_utf8 != []:
+                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:
+                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='eglibc-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 () {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_eglibc', 'libc6', d)
+                bb.data.setVar('PKG_eglibc-dev', 'libc6-dev', d)
+        bb.build.exec_func('package_do_split_gconvs', d)
+}