2 files changed, 272 insertions, 2 deletions

diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
index b8d7ad7d9c..008e580b9b 100644
--- a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
+++ b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
@@ -32,9 +32,14 @@ do_install() {
 }
 
 do_stage() {
-    install -d ${STAGING_INCDIR}
+        install -d ${STAGING_INCDIR}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR}
 
-    cp -a ${S}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR}
+        install -d ${STAGING_LIBDIR}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
+
+        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
 }
 
 PACKAGES = "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
new file mode 100644
index 0000000000..879e719fcd
--- /dev/null
+++ b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
@@ -0,0 +1,265 @@
+INHIBIT_DEFAULT_DEPS = "1"
+
+PROVIDES = "\
+    linux-libc-headers \
+    virtual/arm-none-linux-gnueabi-gcc \
+    virtual/arm-none-linux-gnueabi-g++ \
+    virtual/arm-none-linux-gnueabi-gcc-initial \
+    virtual/arm-none-linux-gnueabi-binutils \
+    virtual/arm-none-linux-gnueabi-libc-for-gcc \
+    virtual/libc \
+    virtual/libintl \
+    virtual/libiconv \
+    glibc-thread-db \
+    virtual/linux-libc-headers "
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+PR = "r1"
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 \
+file://SUPPORTED"
+
+S = "${WORKDIR}/arm-2007q3"
+
+do_install() {
+    install -d ${D}${sysconfdir} ${D}${bindir} ${D}${sbindir} ${D}${base_bindir} ${D}${libdir}
+    install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir}
+
+    cp -a ${S}/arm-none-linux-gnueabi/libc/lib/*  ${D}${base_libdir}
+    cp -a ${S}/arm-none-linux-gnueabi/libc/etc/*  ${D}${sysconfdir}
+    cp -a ${S}/arm-none-linux-gnueabi/libc/sbin/* ${D}${base_sbindir}
+    cp -a ${S}/arm-none-linux-gnueabi/libc/usr/*  ${D}/usr
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR}
+
+        install -d ${STAGING_LIBDIR}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
+
+        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+        cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
+}
+
+PACKAGES = "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
+FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
+FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+                       ${libdir}/libstdc++.so \
+                       ${libdir}/libstdc++.la \
+                       ${libdir}/libstdc++.a \
+                       ${libdir}/libsupc++.la \
+                       ${libdir}/libsupc++.a"
+FILES_linux-libc-headers = "${includedir}/asm* \
+                            ${includedir}/linux \
+                            ${includedir}/mtd \
+                            ${includedir}/rdma \
+                            ${includedir}/scsi \
+                            ${includedir}/sound \
+                            ${includedir}/video \
+"
+
+PACKAGES += "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+
+libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
+
+FILES_glibc = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
+FILES_glibc-dev = "${includedir}"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "/lib/libSegFault*"
+FILES_glibc-extra-nss = "/lib/libnss*"
+FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*.so"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
+FILES_glibc-gconv = "${libdir}/gconv/*"
+FILES_glibc-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug ${base_libdir}/.debug ${libdir}/.debug"
+FILES_catchsegv = "${bindir}/catchsegv"
+RDEPENDS_catchsegv = "libsegfault"
+FILES_glibc-pcprofile = "/lib/libpcprofile.so"
+FILES_glibc-thread-db = "/lib/libthread_db*"
+RPROVIDES_glibc-dev += "libc-dev"
+LEAD_SONAME = "libc.so.6"
+
+DESCRIPTION_sln = "glibc: create symbolic links between files"
+DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts"
+DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services"
+DESCRIPTION_ldd = "glibc: print shared library dependencies"
+DESCRIPTION_localedef = "glibc: compile locale definition files"
+DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
+
+FILES_sln = "${base_sbindir}/sln"
+FILES_localedef = "${bindir}/localedef"
+
+
+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 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 = os.path.join(libdir, "gconv")
+        charmap_dir = os.path.join(datadir, "i18n", "charmaps")
+        locales_dir = os.path.join(datadir, "i18n", "locales")
+        binary_locales_dir = os.path.join(libdir, "locale")
+
+        do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv')
+
+        do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', 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('glibc-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)
+
+        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)
+
+        f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+        supported = f.readlines()
+        f.close()
+
+        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 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):
+                target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+                qemu = "qemu-%s" % target_arch
+                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 = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
+                path = bb.data.getVar("PATH", d, 1)
+                i18npath = os.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 %s/bin/localedef %s" % (path, i18npath, qemu, treedir, 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):
+                output_locale_source(name, locale, encoding)
+
+        # 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))
+}
+
+# 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_glibc', 'libc6', d)
+                bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d)
+        bb.build.exec_func('package_do_split_gconvs', d)
+}