Author: ayoung
Date: Sat Feb 12 04:07:14 2011
New Revision: 9316
URL: http://svn.slimdevices.com/jive?rev=9316&view=rev
Log:
bug 16910: Update toolchain to 2010q3
Checking in the files that could enable this but not making it active.
Tests showed an overall code-size reduction (excluding samba) for a Fab4 build
of 0.7%.
The problem with samba (a known bug, the fix for which is only available from
Code Sourcery upon subscription) can be worked around by using -O0 for the
relevant module.
No pressing need to enable this toolchain version at this time.
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/include/poky-external-csl2010.09.inc
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/meta/external-csl-toolchain_2010.09-50.bb
Modified:
7.6/trunk/squeezeos/poky/build/conf/local.conf.sample
Modified: 7.6/trunk/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/build/conf/local.conf.sample?rev=9316&r1=9315&r2=9316&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/build/conf/local.conf.sample (original)
+++ 7.6/trunk/squeezeos/poky/build/conf/local.conf.sample Sat Feb 12 04:07:14
2011
@@ -121,6 +121,7 @@
#POKYMODE = "external-csl2009q1"
#POKYMODE = "external-csl2009q3"
POKYMODE = "external-csl2010q1"
+#POKYMODE = "external-csl2010.09"
# Uncomment this to specify where BitBake should create its temporary files.
# Note that a full build of everything in OpenEmbedded will take GigaBytes of
hard
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/include/poky-external-csl2010.09.inc
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/include/poky-external-csl2010.09.inc?rev=9316&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/include/poky-external-csl2010.09.inc
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/include/poky-external-csl2010.09.inc
Sat Feb 12 04:07:14 2011
@@ -1,0 +1,21 @@
+#
+# Poky configuration to use external CSL 2010q1 toolchain (ARM EABI)
+#
+
+TARGET_VENDOR = "-none"
+
+PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-intermediate =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
+PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
+
+PREFERRED_VERSION_external-csl-toolchain = "2010.09-50"
+
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/meta/external-csl-toolchain_2010.09-50.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/meta/external-csl-toolchain_2010.09-50.bb?rev=9316&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/meta/external-csl-toolchain_2010.09-50.bb
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/meta/external-csl-toolchain_2010.09-50.bb
Sat Feb 12 04:07:14 2011
@@ -1,0 +1,295 @@
+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-gcc-intermediate \
+ 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-* locale-binary-*"
+PR = "r2"
+
+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"
+
+
+do_unpack2() {
+ mkdir -p ${CROSS_DIR}
+ cp -r ${WORKDIR}/arm-2010.09/arm-none-linux-gnueabi ${CROSS_DIR}
+ cp -r ${WORKDIR}/arm-2010.09/bin ${CROSS_DIR}
+ cp -r ${WORKDIR}/arm-2010.09/lib ${CROSS_DIR}
+ cp -r ${WORKDIR}/arm-2010.09/libexec ${CROSS_DIR}
+ cp -r ${WORKDIR}/arm-2010.09/share ${CROSS_DIR}
+}
+
+addtask unpack2 after do_unpack before do_patch
+
+
+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 ${CROSS_DIR}/arm-none-linux-gnueabi/libc/lib/* ${D}${base_libdir}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/etc/* ${D}${sysconfdir}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/sbin/*
${D}${base_sbindir}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/usr/include/*
${STAGING_INCDIR}
+
+ install -d ${STAGING_LIBDIR}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/usr/lib/*
${STAGING_LIBDIR}
+
+ install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+ cp -a ${CROSS_DIR}/arm-none-linux-gnueabi/libc/lib/*
${STAGING_DIR_TARGET}${base_libdir}
+
+ sed -e "s# /lib# ../../lib#g" \
+ -e "s# /usr/lib# .#g" \
+ ${STAGING_LIBDIR}/libc.so > ${STAGING_LIBDIR}/temp
+ mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libc.so
+
+ sed -e "s# /lib# ../../lib#" \
+ -e "s# /usr/lib# .#g" \
+ ${STAGING_LIBDIR}/libpthread.so > ${STAGING_LIBDIR}/temp
+ mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libpthread.so
+}
+
+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)
+ pkgname = 'locale-binary-' + 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)
+
+ bb.note("assuming binary locale %s (%s) already generated" %
(locale, encoding))
+
+ def output_locale(name, locale, encoding):
+ use_bin = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d,
1)
+ if use_bin:
+ output_locale_binary(name, locale, encoding)
+ else:
+ output_locale_source(name, locale, encoding)
+
+ use_bin = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", 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("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+ if use_bin:
+ bb.note("generation of binary locales packages")
+ do_split_packages(d, binary_locales_dir, file_regex='(.*)',
output_pattern='locale-binary-%s', description='binary locale definition for
%s', extra_depends='', allow_dirs=True)
+ else:
+ bb.note("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_glibc', 'libc6', d)
+ bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d)
+ bb.build.exec_func('package_do_split_gconvs', d)
+}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
