libc locale split
Hi Richard and Saul,
This pull request is the second version of libc locale split, please help to review and pull.
This version reflects the comments from Phil Blundell <[email protected]> that keep the eglibc locale package name unchanged.
Thanks,
Dongxiao
The following changes since commit 2163461ec94528ecf046a04edc5db3d2dd3a6b8b:
systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:14:06 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/libc-locale-v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/libc-locale-v2
Dongxiao Xu (1):
libc-locale: split locale handling from libc recipe.
meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-) create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bb
PATCH 1/1 libc-locale: split locale handling from libc recipe.
*libc's do_package will cost a lot of time due to the locale handing, which may delay the other recipe's do_package task and affect the build performance.
This commit moves locale handling into a separate recipe *libc-locale.
--- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-) create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bb
meta/classes/libc-common.bbclass new file +23 -0
@@ -0,0 +1,23 @@ +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}{sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf +} + +def get_libc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return ""
meta/classes/libc-package.bbclass +0 -24
@@ -37,11 +37,6 @@ python __anonymous () { break } -def get_libc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fp" - return "" - OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" do_configure_prepend() {
@@ -84,25 +79,6 @@ rm -rf ${TMP_LOCALE} } -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}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - TMP_LOCALE="/tmp/locale${libdir}/locale" do_prep_locale_tree() {
meta/conf/distro/include/tclibc-eglibc.inc +1 -1
@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
meta/conf/distro/include/tclibc-glibc.inc +1 -1
@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc to the overrides. OVERRIDES =. "libc-glibc:" -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc"
meta/recipes-core/eglibc/eglibc-initial_2.13.bb +4 -0
@@ -1,6 +1,10 @@ require eglibc_${PV}.bb require eglibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS }
meta/recipes-core/eglibc/eglibc-locale_2.13.bb new file +58 -0
58 lines not on this page · raw message
meta/recipes-core/eglibc/eglibc-package.inc +3 -29
@@ -14,35 +14,13 @@ python __anonymous () { 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 -ENABLE_BINARY_LOCALE_GENERATION ?= "0" -ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-nativesdk = "0" - -#enable locale generation on these arches -# BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" - -# set "1" to use cross-localedef for locale generation -# set "0" for qemu emulation of native localedef for locale generation -LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" - # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile" - -PACKAGES_DYNAMIC = " \ - glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ - eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ - locale-base-*${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile" # Create a eglibc-binaries ALLOW_EMPTY_${PN}-binaries = "1"
@@ -69,7 +47,6 @@ 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"
@@ -88,13 +65,11 @@ FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" -FILES_eglibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/*/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" RPROVIDES_eglibc-dev += "libc-dev" SUMMARY_sln = "The static ln."
@@ -105,9 +80,8 @@ SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services." SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." -DESCRIPTION_localedef = "eglibc: compile locale definition files" SUMMARY_eglibc-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." -inherit libc-package +inherit libc-common
meta/recipes-core/eglibc/eglibc.inc +2 -2
@@ -26,7 +26,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" +PROVIDES += "virtual/libintl" inherit autotools require eglibc-options.inc
@@ -43,7 +43,7 @@ EGLIBCPARALLELISM := "PARALLELMFLAGS="${PARALLEL_MAKE}"" EXTRA_OEMAKE += ${EGLIBCPARALLELISM} PARALLEL_MAKE = "" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES = "glibc catchsegv sln nscd ldd glibc-utils glibc-dev glibc-doc libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" OE_FEATURES = "${@features_to_eglibc_settings(d)}" do_configure_prepend() {
meta/recipes-core/eglibc/eglibc_2.13.bb +12 -0
@@ -110,6 +110,18 @@ do_compile () { ) } +do_install_locale () { + dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} + install -d ${dest} ${dest}${bindir} + cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} + cp -fpPR ${D}${libdir} ${dest}${exec_prefix} + cp -fpPR ${D}${datadir} ${dest}${exec_prefix} + cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} + cp -fpPR ${WORKDIR}/SUPPORTED ${dest} +} + +addtask do_install_locale after do_install before do_populate_sysroot + require eglibc-package.inc BBCLASSEXTEND = "nativesdk"
meta/recipes-core/glibc/glibc-initial_2.10.1.bb +4 -0
@@ -1,6 +1,10 @@ require glibc_${PV}.bb require glibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS }
meta/recipes-core/glibc/glibc-locale_2.10.1.bb new file +50 -0
50 lines not on this page · raw message
meta/recipes-core/glibc/glibc-package.inc +4 -25
@@ -14,34 +14,14 @@ python __anonymous () { 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" -ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-nativesdk = "0" - -# BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" - -# set "1" to use cross-localedef for locale generation -# set "0" for qemu emulation of native localedef for locale generation -LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" - PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \ - ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ - ${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ + ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ + libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ ${PN}-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \ - glibc-binary-localedata-*" - libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \ ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \
@@ -77,7 +57,6 @@ FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_glibc-thread-db = "${base_libdir}/libthread_db*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" RPROVIDES_glibc-dev += "libc-dev" SUMMARY_sln = "The static ln."
@@ -88,10 +67,10 @@ SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services. SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." -DESCRIPTION_localedef = "glibc: compile locale definition files" SUMMARY_glibc-utils = "Miscellaneous utilities provided by glibc" DESCRIPTION_glibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" -inherit libc-package +inherit libc-common +
meta/recipes-core/glibc/glibc.inc +1 -1
@@ -15,7 +15,7 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #RDEPENDS_ldd += " bash" #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" +PROVIDES += "virtual/libintl" STAGINGCC = "gcc-cross-intermediate" STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
meta/recipes-core/glibc/glibc_2.10.1.bb +12 -0
@@ -154,6 +154,18 @@ do_compile () { ) } +do_install_locale () { + dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS} + install -d ${dest} ${dest}${bindir} + cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} + cp -fpPR ${D}${libdir} ${dest}${exec_prefix} + cp -fpPR ${D}${datadir} ${dest}${exec_prefix} + cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} + cp -fpPR ${WORKDIR}/SUPPORTED ${dest} +} + +addtask do_install_locale after do_install before do_populate_sysroot + require glibc-stage.inc require glibc-package.inc
meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb +1 -0
@@ -40,6 +40,7 @@ do_install() { GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile" +inherit libc-common inherit libc-package PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
Signature · 1 line
1.7.1
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on there?
p.
Quoted 54 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.This commit moves locale handling into a separate recipe *libc-locale.
Signed-off-by Dongxiao Xu <[email protected]>--- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-) create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bbmeta/conf/distro/include/tclibc-eglibc.inc +1
-1@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc"meta/conf/distro/include/tclibc-glibc.inc +1
-1@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc to the overrides. OVERRIDES =. "libc-glibc:" -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc"
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 11 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Phil Blundell
Sent: Wednesday, June 22, 2011 7:45 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on there?
Generally, the purpose of this patch is to reduce eglibc's do_package time.
Since many other recipes' do_package have dependency on eglibc's do_package, thus the sooner eglibc could finish its do_package, the ealier can other do_packages be executed, which improves the parallelism.
From our study, we found most of eglibc's do_package time is used to handle locale. Therefore we split all the locale related stuffs into a separately recipe eglibc-locale.
Thanks,
Dongxiao
Quoted 71 lines
p.
Quoted 6 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.This commit moves locale handling into a separate recipe *libc-locale.
Quoted 8 lines
Signed-off-by Dongxiao Xu <[email protected]>--- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58++++++++++++++++++++
Quoted 5 lines
meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50+++++++++++++++++
Quoted 34 lines
meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-) create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bbmeta/conf/distro/include/tclibc-eglibc.inc +0
-0@@ -10,7 +10,7 @@ TARGET_OS_powerpc ="linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
# Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc"meta/conf/distro/include/tclibc-eglibc.inc +1
-1-PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc"meta/conf/distro/include/tclibc-glibc.inc +0
-0@@ -10,7 +10,7 @@ TARGET_OS_powerpc ="linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
# Add glibc to the overrides.
OVERRIDES =. "libc-glibc:"meta/conf/distro/include/tclibc-glibc.inc TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d · line 16
Quoted 5 lines
meta/conf/distro/include/tclibc-glibc.inc +1
-1-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 9 lines · Dongxiao
Quoted 9 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Phil Blundell
Sent: Wednesday, June 22, 2011 7:45 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 8 lines
Quoted 2 lines
I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on there?
Generally, the purpose of this patch is to reduce eglibc's
do_packagetime.Since many other recipes'
do_packagehave dependency on eglibc'sdo_package, thus the sooner eglibc could finish itsdo_package, the ealier can otherdo_packagesbe executed, which improves the parallelism.From our study, we found most of eglibc's
do_packagetime is used to handle locale. Therefore we split all the locale related stuffs into a separately recipe eglibc-locale.
Yes, I understand that. But I don't think this answers the question about why, specifically, glibc-locale is now PROVIDEing virtual/libiconv. Does that recipe, in fact, implement libiconv?
p.
Quoted 80 lines
Thanks,
DongxiaoQuoted 59 lines
p.
Quoted 6 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.This commit moves locale handling into a separate recipe *libc-locale.
Quoted 8 lines
Signed-off-by Dongxiao Xu <[email protected]>--- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58++++++++++++++++++++
Quoted 5 lines
meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50+++++++++++++++++
Quoted 34 lines
meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-) create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bbmeta/conf/distro/include/tclibc-eglibc.inc +0
-0@@ -10,7 +10,7 @@ TARGET_OS_powerpc ="linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
# Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc"meta/conf/distro/include/tclibc-eglibc.inc +1
-1-PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc"meta/conf/distro/include/tclibc-glibc.inc +0
-0@@ -10,7 +10,7 @@ TARGET_OS_powerpc ="linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
# Add glibc to the overrides.
OVERRIDES =. "libc-glibc:"Quoted 12 lines
meta/conf/distro/include/tclibc-glibc.inc TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d · line 16
Quoted 5 lines
meta/conf/distro/include/tclibc-glibc.inc +1
-1-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 15 lines · Phil Blundell
Quoted 14 lines · Dongxiao
Quoted 11 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Phil Blundell
Sent: Wednesday, June 22, 2011 7:45 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on there?
Generally, the purpose of this patch is to reduce eglibc's
do_packagetime.
Quoted 7 lines
Quoted 3 lines
Since many other recipes'
do_packagehave dependency on eglibc'sdo_package, thus the sooner eglibc could finish itsdo_package, the ealier can otherdo_packagesbe executed, which improves the parallelism.From our study, we found most of eglibc's
do_packagetime is used to handle locale. Therefore we split all the locale related stuffs into a separately recipe eglibc-locale.Yes, I understand that. But I don't think this answers the question about why, specifically, glibc-locale is now PROVIDEing virtual/libiconv. Does that recipe, in fact, implement libiconv?
I must admit I was wondering about this too. Isn't the libiconv functionality still packaged as part of the libc recipe, not the locale part?
Cheers,
Richard
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 20 lines · Richard Purdie
Quoted 19 lines · Phil Blundell
Quoted 17 lines · Dongxiao
Quoted 11 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Phil Blundell
Sent: Wednesday, June 22, 2011 7:45 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on there?
Generally, the purpose of this patch is to reduce eglibc's
do_packagetime.Since many other recipes'
do_packagehave dependency on eglibc'sdo_package, thus the sooner eglibc could finish itsdo_package, the ealier can otherdo_packagesbe executed, which improves the parallelism.From our study, we found most of eglibc's
do_packagetime is used to handle locale. Therefore we split all the locale related stuffs into a separately recipe eglibc-locale.
Quoted 8 lines
Quoted 3 lines
Yes, I understand that. But I don't think this answers the question about why, specifically, glibc-locale is now PROVIDEing virtual/libiconv. Does that recipe, in fact, implement libiconv?
I must admit I was wondering about this too. Isn't the libiconv functionality still packaged as part of the libc recipe, not the locale part?
yes it should be in libc
Quoted 9 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 40 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Friday, June 24, 2011 7:43 AM
To: [email protected]
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.Quoted 5 lines · Richard Purdie
Quoted 4 lines · Phil Blundell
Quoted 3 lines · Dongxiao
Quoted 3 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] OnBehalf
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Of Phil Blundell
Sent: Wednesday, June 22, 2011 7:45 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc recipe.I still don't quite understand why the virtual/libiconv provider has moved from eglibc to eglibc-locale. Can you explain what's going on
there?
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Generally, the purpose of this patch is to reduce eglibc's
do_packagetime.Since many other recipes'
do_packagehave dependency on eglibc's
do_package, thus the sooner eglibc could finish itsdo_package, the ealier can otherdo_packagesbe executed, which improves the parallelism.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
From our study, we found most of eglibc's
do_packagetime is used tohandle locale. Therefore we split all the locale related stuffs into a separately recipe eglibc-locale.
Quoted 5 lines
Quoted 4 lines
Yes, I understand that. But I don't think this answers the question about why, specifically, glibc-locale is now PROVIDEing virtual/libiconv. Does that recipe, in fact, implement libiconv?
Quoted 5 lines
Quoted 4 lines
I must admit I was wondering about this too. Isn't the libiconv functionality still packaged as part of the libc recipe, not the locale part?
yes it should be in libc
Oh, it should be a mistake. I have changed that in my patch and doing test for it now.
Thanks,
Dongxiao
Quoted 16 lines
Quoted 10 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
In reply to Dongxiao XuQuoted 3 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.
you could also move the locale generation into a task of its own instead of new recipe
Quoted 502 lines
This commit moves locale handling into a separate recipe *libc-locale.
Signed-off-by Dongxiao Xu<[email protected]>--- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 58 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 4 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 12 ++++ meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 4 ++ meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 50 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 15 files changed, 176 insertions(+), 83 deletions(-)create mode 100644 meta/classes/libc-common.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb create mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bb
meta/classes/libc-common.bbclass new file +23
-0@@ -0,0 +1,23 @@ +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}{sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf +} + +def get_libc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return ""meta/classes/libc-package.bbclass +0
-24@@ -37,11 +37,6 @@ python __anonymous () { break } -def get_libc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fp" - return "" - OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" do_configure_prepend() {@@ -84,25 +79,6 @@ rm -rf ${TMP_LOCALE} } -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}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - TMP_LOCALE="/tmp/locale${libdir}/locale" do_prep_locale_tree() {meta/conf/distro/include/tclibc-eglibc.inc +1
-1@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc"meta/conf/distro/include/tclibc-glibc.inc +1
-1@@ -10,7 +10,7 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d # Add glibc to the overrides. OVERRIDES =. "libc-glibc:" -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-locale" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc"meta/recipes-core/eglibc/eglibc-initial_2.13.bb +4
-0@@ -1,6 +1,10 @@ require eglibc_${PV}.bb require eglibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS }meta/recipes-core/eglibc/eglibc-locale_2.13.bb new file +58
-0@@ -0,0 +1,58 @@ +INHIBIT_DEFAULT_DEPS = "1" +LICENSE = "LGPL" + +BPN = "eglibc" + +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_configure[noexec] = "1" +do_compile[noexec] = "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 +ENABLE_BINARY_LOCALE_GENERATION ?= "0" +ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" + +#enable locale generation on these arches +# BINARY_LOCALE_ARCHES is a space separated list of regular expressions +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" + +# set "1" to use cross-localedef for locale generation +# set "0" for qemu emulation of native localedef for locale generation +LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" + +PR = "r0" + +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + +PACKAGES = "eglibc-locale localedef${PKGSUFFIX}" + +PACKAGES_DYNAMIC = "locale-base-* \ + eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ + glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" + +PROVIDES = "virtual/libiconv" + +RPROVIDES_eglibc-locale = "glibc-locale" + +FILES_eglibc-gconv = "${libdir}/gconv/*" +FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" + +do_install () { + cp -fpPR ${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} + cp -fpPR ${D}/SUPPORTED ${WORKDIR} +} + +DESCRIPTION_localedef = "eglibc: compile locale definition files" + +inherit libc-package + +do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" + +BBCLASSEXTEND = "nativesdk"meta/recipes-core/eglibc/eglibc-package.inc +3
-29@@ -14,35 +14,13 @@ python __anonymous () { 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 -ENABLE_BINARY_LOCALE_GENERATION ?= "0" -ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-nativesdk = "0" - -#enable locale generation on these arches -# BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" - -# set "1" to use cross-localedef for locale generation -# set "0" for qemu emulation of native localedef for locale generation -LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" - # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile" - -PACKAGES_DYNAMIC = " \ - glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ - eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ - locale-base-*${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile" # Create a eglibc-binaries ALLOW_EMPTY_${PN}-binaries = "1"@@ -69,7 +47,6 @@ 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"@@ -88,13 +65,11 @@ FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" -FILES_eglibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/*/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" RPROVIDES_eglibc-dev += "libc-dev" SUMMARY_sln = "The static ln."@@ -105,9 +80,8 @@ SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services." SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." -DESCRIPTION_localedef = "eglibc: compile locale definition files" SUMMARY_eglibc-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." -inherit libc-package +inherit libc-commonmeta/recipes-core/eglibc/eglibc.inc +2
-2@@ -26,7 +26,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" +PROVIDES += "virtual/libintl" inherit autotools require eglibc-options.inc@@ -43,7 +43,7 @@ EGLIBCPARALLELISM := "PARALLELMFLAGS="${PARALLEL_MAKE}"" EXTRA_OEMAKE += ${EGLIBCPARALLELISM} PARALLEL_MAKE = "" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES = "glibc catchsegv sln nscd ldd glibc-utils glibc-dev glibc-doc libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" OE_FEATURES = "${@features_to_eglibc_settings(d)}" do_configure_prepend() {meta/recipes-core/eglibc/eglibc_2.13.bb +12
-0@@ -110,6 +110,18 @@ do_compile () { ) } +do_install_locale () { + dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} + install -d ${dest} ${dest}${bindir} + cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} + cp -fpPR ${D}${libdir} ${dest}${exec_prefix} + cp -fpPR ${D}${datadir} ${dest}${exec_prefix} + cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} + cp -fpPR ${WORKDIR}/SUPPORTED ${dest} +} + +addtask do_install_locale after do_install before do_populate_sysroot + require eglibc-package.inc BBCLASSEXTEND = "nativesdk"meta/recipes-core/glibc/glibc-initial_2.10.1.bb +4
-0@@ -1,6 +1,10 @@ require glibc_${PV}.bb require glibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS }meta/recipes-core/glibc/glibc-locale_2.10.1.bb new file +50
-0@@ -0,0 +1,50 @@ +#INHIBIT_DEFAULT_DEPS = "1" +LICENSE = "LGPL" + +BPN = "glibc" + +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_configure[noexec] = "1" +do_compile[noexec] = "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 +ENABLE_BINARY_LOCALE_GENERATION ?= "0" +ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-locale-nativesdk = "0" + +#enable locale generation on these arches +# BINARY_LOCALE_ARCHES is a space separated list of regular expressions +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" + +# set "1" to use cross-localedef for locale generation +# set "0" for qemu emulation of native localedef for locale generation +LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" + +PR = "r0" + +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + +PACKAGES = "glibc-locale localedef${PKGSUFFIX}" + +PACKAGES_DYNAMIC = "locale-base-* \ + glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" + + +PROVIDES = "virtual/libiconv" + +FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" + +do_install () { + cp -fpPR ${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} + cp -fpPR ${D}/SUPPORTED ${WORKDIR} +} + +do_install[depends] += "virtual/libc:do_populate_sysroot" +do_install_virtclass-nativesdk[depends] += "virtual/libc-nativesdk:do_populate_sysroot"meta/recipes-core/glibc/glibc-package.inc +4
-25@@ -14,34 +14,14 @@ python __anonymous () { 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" -ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-nativesdk = "0" - -# BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" - -# set "1" to use cross-localedef for locale generation -# set "0" for qemu emulation of native localedef for locale generation -LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" - PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \ - ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ - ${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ + ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ + libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ ${PN}-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \ - glibc-binary-localedata-*" - libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \ ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \@@ -77,7 +57,6 @@ FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_glibc-thread-db = "${base_libdir}/libthread_db*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" RPROVIDES_glibc-dev += "libc-dev" SUMMARY_sln = "The static ln."@@ -88,10 +67,10 @@ SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services. SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." -DESCRIPTION_localedef = "glibc: compile locale definition files" SUMMARY_glibc-utils = "Miscellaneous utilities provided by glibc" DESCRIPTION_glibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" -inherit libc-package +inherit libc-common +meta/recipes-core/glibc/glibc.inc +1
-1@@ -15,7 +15,7 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #RDEPENDS_ldd += " bash" #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" +PROVIDES += "virtual/libintl" STAGINGCC = "gcc-cross-intermediate" STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"meta/recipes-core/glibc/glibc_2.10.1.bb +12
-0@@ -154,6 +154,18 @@ do_compile () { ) } +do_install_locale () { + dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS} + install -d ${dest} ${dest}${bindir} + cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} + cp -fpPR ${D}${libdir} ${dest}${exec_prefix} + cp -fpPR ${D}${datadir} ${dest}${exec_prefix} + cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} + cp -fpPR ${WORKDIR}/SUPPORTED ${dest} +} + +addtask do_install_locale after do_install before do_populate_sysroot + require glibc-stage.inc require glibc-package.incmeta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb +1
-0@@ -40,6 +40,7 @@ do_install() { GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile" +inherit libc-common inherit libc-package PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 7 lines · Khem Raj
Quoted 3 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.you could also move the locale generation into a task of its own instead of new recipe
It'd be hard to get the dependencies to work out right if you did that, though. I think a new recipe probably is the right answer.
p.
[ .... 100000 quoted lines snipped ... ]
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 11 lines · Phil Blundell
Quoted 7 lines · Khem Raj
Quoted 3 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.you could also move the locale generation into a task of its own instead of new recipe
It'd be hard to get the dependencies to work out right if you did that, though. I think a new recipe probably is the right answer.
And in the case of libc, the locales need to be done -after- the populate_sysroot, or we don't get the parallelism improvement.
--Mark
Quoted 10 lines
p.
[ .... 100000 quoted lines snipped ... ]
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe.
Quoted 7 lines · Mark Hatle
Quoted 6 lines · Phil Blundell
Quoted 5 lines · Khem Raj
Quoted 3 lines · Dongxiao Xu
*libc's
do_packagewill cost a lot of time due to the locale handing, which may delay the other recipe'sdo_packagetask and affect the build performance.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
you could also move the locale generation into a task of its own instead of new recipe
It'd be hard to get the dependencies to work out right if you did that, though. I think a new recipe probably is the right answer.
And in the case of libc, the locales need to be done -after- the
populate_sysroot, or we don't get the parallelism improvement.
ofcourse thats why I was suggesting a new task.
Quoted 19 lines
--Mark
Quoted 10 lines
p.
[ .... 100000 quoted lines snipped ... ]
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core