* [PATCH 0/1 v3][PULL] libc locale split @ 2011-06-27 8:37 Dongxiao Xu 2011-06-27 8:37 ` [PATCH 1/1] libc-locale: split locale handling from libc recipe Dongxiao Xu 0 siblings, 1 reply; 12+ messages in thread From: Dongxiao Xu @ 2011-06-27 8:37 UTC (permalink / raw) To: openembedded-core Hi Richard and Saul, This pull request is the third version of libc locale split, please help to review and pull. Changes from v2: Fixed a mistake that virtual/libiconv should be in libc but not libc-locale. Thanks, Dongxiao The following changes since commit a1f79a7896b6411669b3ccada6204d2695e80fc5: runqueue.py: Add umask task control (2011-06-24 12:23:12 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dxu4/libc-locale-v3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/libc-locale-v3 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 | 1 + meta/conf/distro/include/tclibc-glibc.inc | 1 + meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 56 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 2 +- 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 | 49 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 14 files changed, 171 insertions(+), 79 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-27 8:37 [PATCH 0/1 v3][PULL] libc locale split Dongxiao Xu @ 2011-06-27 8:37 ` Dongxiao Xu 2011-06-27 8:58 ` Phil Blundell 2011-07-08 14:55 ` Phil Blundell 0 siblings, 2 replies; 12+ messages in thread From: Dongxiao Xu @ 2011-06-27 8:37 UTC (permalink / raw) To: openembedded-core *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. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> --- meta/classes/libc-common.bbclass | 23 ++++++++ meta/classes/libc-package.bbclass | 24 -------- meta/conf/distro/include/tclibc-eglibc.inc | 1 + meta/conf/distro/include/tclibc-glibc.inc | 1 + meta/recipes-core/eglibc/eglibc-initial_2.13.bb | 4 ++ meta/recipes-core/eglibc/eglibc-locale_2.13.bb | 56 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc-package.inc | 32 +---------- meta/recipes-core/eglibc/eglibc.inc | 2 +- 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 | 49 +++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 29 ++--------- meta/recipes-core/glibc/glibc_2.10.1.bb | 12 ++++ .../meta/external-csl-toolchain_2008q3-72.bb | 1 + 14 files changed, 171 insertions(+), 79 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 diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass new file mode 100644 index 0000000..bae0ace --- /dev/null +++ b/meta/classes/libc-common.bbclass @@ -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 "" diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 55e3d48..5737af4 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -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() { diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index a4c648e..e070aad 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index e5843b0..5e7afc1 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" +PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb index 787c762..b934f5b 100644 --- a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb @@ -1,6 +1,10 @@ require eglibc_${PV}.bb require eglibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS } diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.13.bb b/meta/recipes-core/eglibc/eglibc-locale_2.13.bb new file mode 100644 index 0000000..ac91a5e --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-locale_2.13.bb @@ -0,0 +1,56 @@ +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/libc-locale" + +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" diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index b5531ab..c7c3992 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -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 libsotruss${PKGSUFFIX}" - -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" @@ -89,14 +66,12 @@ 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 ${libdir}/audit/.debug" +FILES_${PN}-dbg += "${libexecdir}/*/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" EDEPENDS_eglibc-utils = "libsotruss" 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." @@ -107,10 +82,9 @@ 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, ..." DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" -inherit libc-package +inherit libc-common diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 616f1af..74afb9d 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.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() { diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 3490d2d..603d9cd 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -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" diff --git a/meta/recipes-core/glibc/glibc-initial_2.10.1.bb b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb index d662970..bc3d7e4 100644 --- a/meta/recipes-core/glibc/glibc-initial_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb @@ -1,6 +1,10 @@ require glibc_${PV}.bb require glibc-initial.inc +do_install_locale() { + : +} + do_configure_prepend () { unset CFLAGS } diff --git a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb new file mode 100644 index 0000000..357722f --- /dev/null +++ b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb @@ -0,0 +1,49 @@ +#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" + +PROVIDES = "virtual/libc-locale" + +PACKAGES = "glibc-locale localedef${PKGSUFFIX}" + +PACKAGES_DYNAMIC = "locale-base-* \ + glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" + +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" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 27dc427..5373d56 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -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 + diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb index 33ebe24..a2e7b83 100644 --- a/meta/recipes-core/glibc/glibc_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc_2.10.1.bb @@ -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 diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb index f714928..a874c8b 100644 --- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb +++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb @@ -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" -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-27 8:37 ` [PATCH 1/1] libc-locale: split locale handling from libc recipe Dongxiao Xu @ 2011-06-27 8:58 ` Phil Blundell 2011-06-28 0:51 ` Xu, Dongxiao 2011-06-28 4:12 ` Xu, Dongxiao 2011-07-08 14:55 ` Phil Blundell 1 sibling, 2 replies; 12+ messages in thread From: Phil Blundell @ 2011-06-27 8:58 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > -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 libsotruss${PKGSUFFIX}" > - > -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" You seem to have made a bunch of changes here that are not related to locales. What are those about? > -FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug ${libdir}/audit/.debug" > +FILES_${PN}-dbg += "${libexecdir}/*/.debug" Likewise. Also, why is localedef getting packaged by libc-locale? Not that I think it's necessarily a problem but it seems a little bit strange. p. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-27 8:58 ` Phil Blundell @ 2011-06-28 0:51 ` Xu, Dongxiao 2011-06-28 9:07 ` Phil Blundell 2011-06-28 4:12 ` Xu, Dongxiao 1 sibling, 1 reply; 12+ messages in thread From: Xu, Dongxiao @ 2011-06-28 0:51 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Phil Blundell > Sent: Monday, June 27, 2011 4:58 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. > > On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > > -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 libsotruss${PKGSUFFIX}" > > - > > -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" > > You seem to have made a bunch of changes here that are not related to locales. > What are those about? They are locale related changes. Locale related stuffs in the above PACKAGES and PACKAGES_DYNAMIC are moved to eglibc-locale recipe. > > > -FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug > ${libdir}/audit/.debug" > > +FILES_${PN}-dbg += "${libexecdir}/*/.debug" > > Likewise. > > Also, why is localedef getting packaged by libc-locale? Not that I think it's > necessarily a problem but it seems a little bit strange. Originally I thought of putting all locale related things to eglibc-locale. Now actually virtual/libiconv belongs to eglibc. Thus I am OK to move localedef from eglibc-locale to eglibc, and will include this in my next pull request. Thanks, Dongxiao > > p. > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 0:51 ` Xu, Dongxiao @ 2011-06-28 9:07 ` Phil Blundell 2011-06-28 11:07 ` Richard Purdie 0 siblings, 1 reply; 12+ messages in thread From: Phil Blundell @ 2011-06-28 9:07 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-06-28 at 08:51 +0800, Xu, Dongxiao wrote: > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > > Phil Blundell > > Sent: Monday, June 27, 2011 4:58 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. > > > > On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > > > -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 libsotruss${PKGSUFFIX}" > > > - > > > -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" > > > > You seem to have made a bunch of changes here that are not related to locales. > > What are those about? > > They are locale related changes. > Locale related stuffs in the above PACKAGES and PACKAGES_DYNAMIC are moved to eglibc-locale recipe. Is libsotruss${PKGSUFFIX} (for example) really a "locale related stuff"? It's not obvious to me what the connection is. p. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 9:07 ` Phil Blundell @ 2011-06-28 11:07 ` Richard Purdie 2011-06-28 12:17 ` Koen Kooi 0 siblings, 1 reply; 12+ messages in thread From: Richard Purdie @ 2011-06-28 11:07 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-06-28 at 10:07 +0100, Phil Blundell wrote: > On Tue, 2011-06-28 at 08:51 +0800, Xu, Dongxiao wrote: > > > -----Original Message----- > > > From: openembedded-core-bounces@lists.openembedded.org > > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > > > Phil Blundell > > > Sent: Monday, June 27, 2011 4:58 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. > > > > > > On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > > > > -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 libsotruss${PKGSUFFIX}" > > > > - > > > > -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" > > > > > > You seem to have made a bunch of changes here that are not related to locales. > > > What are those about? > > > > They are locale related changes. > > Locale related stuffs in the above PACKAGES and PACKAGES_DYNAMIC are moved to eglibc-locale recipe. > > Is libsotruss${PKGSUFFIX} (for example) really a "locale related stuff"? > It's not obvious to me what the connection is. Dongxiao: What Phil is referring to here is that libsotruss${PKGSUFFIX} disappeared from PACKAGES and that also "${libdir}/audit/.debug" disappeared from FILES_${PN}-dbg. Specifically these changes came in as part of: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=77c2dd944db42e40cc8467e6bc5a175fed90c251 which I don't think your patch accounted for. Since this patch has been around for a while and it otherwise looks good, I've fixed up these couple of issues and merged it though. Cheers, Richard ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 11:07 ` Richard Purdie @ 2011-06-28 12:17 ` Koen Kooi 2011-06-28 14:00 ` Richard Purdie 0 siblings, 1 reply; 12+ messages in thread From: Koen Kooi @ 2011-06-28 12:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 28 jun 2011, om 13:07 heeft Richard Purdie het volgende geschreven: > On Tue, 2011-06-28 at 10:07 +0100, Phil Blundell wrote: >> On Tue, 2011-06-28 at 08:51 +0800, Xu, Dongxiao wrote: >>>> -----Original Message----- >>>> From: openembedded-core-bounces@lists.openembedded.org >>>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of >>>> Phil Blundell >>>> Sent: Monday, June 27, 2011 4:58 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. >>>> >>>> On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: >>>>> -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 libsotruss${PKGSUFFIX}" >>>>> - >>>>> -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" >>>> >>>> You seem to have made a bunch of changes here that are not related to locales. >>>> What are those about? >>> >>> They are locale related changes. >>> Locale related stuffs in the above PACKAGES and PACKAGES_DYNAMIC are moved to eglibc-locale recipe. >> >> Is libsotruss${PKGSUFFIX} (for example) really a "locale related stuff"? >> It's not obvious to me what the connection is. > > Dongxiao: What Phil is referring to here is that libsotruss${PKGSUFFIX} > disappeared from PACKAGES and that also "${libdir}/audit/.debug" > disappeared from FILES_${PN}-dbg. > > Specifically these changes came in as part of: > > http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=77c2dd944db42e40cc8467e6bc5a175fed90c251 > > which I don't think your patch accounted for. > > Since this patch has been around for a while and it otherwise looks > good, I've fixed up these couple of issues and merged it though. This breaks when using eglibc 2.12 :( ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 12:17 ` Koen Kooi @ 2011-06-28 14:00 ` Richard Purdie 2011-06-28 19:37 ` Koen Kooi 0 siblings, 1 reply; 12+ messages in thread From: Richard Purdie @ 2011-06-28 14:00 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-06-28 at 14:17 +0200, Koen Kooi wrote: > Op 28 jun 2011, om 13:07 heeft Richard Purdie het volgende geschreven: > > On Tue, 2011-06-28 at 10:07 +0100, Phil Blundell wrote: > > > > Dongxiao: What Phil is referring to here is that libsotruss${PKGSUFFIX} > > disappeared from PACKAGES and that also "${libdir}/audit/.debug" > > disappeared from FILES_${PN}-dbg. > > > > Specifically these changes came in as part of: > > > > http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=77c2dd944db42e40cc8467e6bc5a175fed90c251 > > > > which I don't think your patch accounted for. > > > > Since this patch has been around for a while and it otherwise looks > > good, I've fixed up these couple of issues and merged it though. > > This breaks when using eglibc 2.12 :( Sorry, I've pushed some cleanup to resolve that. Cheers, Richard ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 14:00 ` Richard Purdie @ 2011-06-28 19:37 ` Koen Kooi 2011-06-28 20:15 ` Koen Kooi 0 siblings, 1 reply; 12+ messages in thread From: Koen Kooi @ 2011-06-28 19:37 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 28 jun 2011, om 16:00 heeft Richard Purdie het volgende geschreven: > On Tue, 2011-06-28 at 14:17 +0200, Koen Kooi wrote: >> Op 28 jun 2011, om 13:07 heeft Richard Purdie het volgende geschreven: >>> On Tue, 2011-06-28 at 10:07 +0100, Phil Blundell wrote: > >>> >>> Dongxiao: What Phil is referring to here is that libsotruss${PKGSUFFIX} >>> disappeared from PACKAGES and that also "${libdir}/audit/.debug" >>> disappeared from FILES_${PN}-dbg. >>> >>> Specifically these changes came in as part of: >>> >>> http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=77c2dd944db42e40cc8467e6bc5a175fed90c251 >>> >>> which I don't think your patch accounted for. >>> >>> Since this patch has been around for a while and it otherwise looks >>> good, I've fixed up these couple of issues and merged it though. >> >> This breaks when using eglibc 2.12 :( > > Sorry, I've pushed some cleanup to resolve that. So after my shlib renaming patch I still can't build any image, since locale-base-* has disappeared. Is there anything related to libc and libc-locales this patch *didn't* break? ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-28 19:37 ` Koen Kooi @ 2011-06-28 20:15 ` Koen Kooi 0 siblings, 0 replies; 12+ messages in thread From: Koen Kooi @ 2011-06-28 20:15 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 28 jun 2011, om 21:37 heeft Koen Kooi het volgende geschreven: > > Op 28 jun 2011, om 16:00 heeft Richard Purdie het volgende geschreven: > >> On Tue, 2011-06-28 at 14:17 +0200, Koen Kooi wrote: >>> Op 28 jun 2011, om 13:07 heeft Richard Purdie het volgende geschreven: >>>> On Tue, 2011-06-28 at 10:07 +0100, Phil Blundell wrote: >> >>>> >>>> Dongxiao: What Phil is referring to here is that libsotruss${PKGSUFFIX} >>>> disappeared from PACKAGES and that also "${libdir}/audit/.debug" >>>> disappeared from FILES_${PN}-dbg. >>>> >>>> Specifically these changes came in as part of: >>>> >>>> http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=77c2dd944db42e40cc8467e6bc5a175fed90c251 >>>> >>>> which I don't think your patch accounted for. >>>> >>>> Since this patch has been around for a while and it otherwise looks >>>> good, I've fixed up these couple of issues and merged it though. >>> >>> This breaks when using eglibc 2.12 :( >> >> Sorry, I've pushed some cleanup to resolve that. > > So after my shlib renaming patch I still can't build any image, since locale-base-* has disappeared. Is there anything related to libc and libc-locales this patch *didn't* break? Actually, I'm a moron. Stay tuned for v2 of the shlib patch ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-27 8:58 ` Phil Blundell 2011-06-28 0:51 ` Xu, Dongxiao @ 2011-06-28 4:12 ` Xu, Dongxiao 1 sibling, 0 replies; 12+ messages in thread From: Xu, Dongxiao @ 2011-06-28 4:12 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: Xu, Dongxiao > Sent: Tuesday, June 28, 2011 8:52 AM > To: Patches and discussions about the oe-core layer > Subject: RE: [OE-core] [PATCH 1/1] libc-locale: split locale handling from libc > recipe. > > > > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf > Of > > Phil Blundell > > Sent: Monday, June 27, 2011 4:58 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. > > > > On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > > > -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 libsotruss${PKGSUFFIX}" > > > - > > > -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" > > > > You seem to have made a bunch of changes here that are not related to > locales. > > What are those about? > > They are locale related changes. > Locale related stuffs in the above PACKAGES and PACKAGES_DYNAMIC are > moved to eglibc-locale recipe. > > > > > > -FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug > > ${libdir}/audit/.debug" > > > +FILES_${PN}-dbg += "${libexecdir}/*/.debug" > > > > Likewise. > > > > Also, why is localedef getting packaged by libc-locale? Not that I > > think it's necessarily a problem but it seems a little bit strange. > > Originally I thought of putting all locale related things to eglibc-locale. > Now actually virtual/libiconv belongs to eglibc. > Thus I am OK to move localedef from eglibc-locale to eglibc, and will include this > in my next pull request. Just did an experiment to move "localedef" in eglibc instead of eglibc-locale, however eglibc-locale's do_package met errors since it needs "localedef" to generate locales, see libc-packages.inc. Therefore localedef still needs to be packaged in eglibc-locale recipe. Thanks, Dongxiao > > Thanks, > Dongxiao > > > > > p. > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] libc-locale: split locale handling from libc recipe. 2011-06-27 8:37 ` [PATCH 1/1] libc-locale: split locale handling from libc recipe Dongxiao Xu 2011-06-27 8:58 ` Phil Blundell @ 2011-07-08 14:55 ` Phil Blundell 1 sibling, 0 replies; 12+ messages in thread From: Phil Blundell @ 2011-07-08 14:55 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Mon, 2011-06-27 at 16:37 +0800, Dongxiao Xu wrote: > +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} > +} This turns out to lose if you don't have libc-locale-code in DISTRO_FEATURES, since then localedef isn't installed and it blows up trying to copy that file. p. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-07-08 14:59 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-06-27 8:37 [PATCH 0/1 v3][PULL] libc locale split Dongxiao Xu 2011-06-27 8:37 ` [PATCH 1/1] libc-locale: split locale handling from libc recipe Dongxiao Xu 2011-06-27 8:58 ` Phil Blundell 2011-06-28 0:51 ` Xu, Dongxiao 2011-06-28 9:07 ` Phil Blundell 2011-06-28 11:07 ` Richard Purdie 2011-06-28 12:17 ` Koen Kooi 2011-06-28 14:00 ` Richard Purdie 2011-06-28 19:37 ` Koen Kooi 2011-06-28 20:15 ` Koen Kooi 2011-06-28 4:12 ` Xu, Dongxiao 2011-07-08 14:55 ` Phil Blundell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox