diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 13:04:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 14:27:44 +0100 |
| commit | 1a3a76e4652b95b640c287cb3672ccc146b023ca (patch) | |
| tree | ea8ee18ed6be747877780c44562ede6e083291ed /meta/recipes-core | |
| parent | dd090729dad1e7788c9d9eac111d9207bae60fe0 (diff) | |
| download | openembedded-core-1a3a76e4652b95b640c287cb3672ccc146b023ca.tar.gz openembedded-core-1a3a76e4652b95b640c287cb3672ccc146b023ca.tar.bz2 openembedded-core-1a3a76e4652b95b640c287cb3672ccc146b023ca.tar.xz openembedded-core-1a3a76e4652b95b640c287cb3672ccc146b023ca.zip | |
libc-locale: Fixup various packaging warnings
After the recent locale changes there were warnings about many unpackaged files.
Fix this by directing libc-package.bbclass to operate directly on the files in
the sysroot and adding packaging for .debug files in this package.
Also sync up the eglibc and glibc versions of this code more closely.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 22 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 23 |
2 files changed, 32 insertions, 13 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index 7c4b1d501..c84f03292 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -26,29 +26,37 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # set "0" for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" -PR = "r1" +PR = "r2" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "localedef${PKGSUFFIX}" +PROVIDES = "virtual/libc-locale${PKGSUFFIX}" + +PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg" 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${PKGSUFFIX}" +DESCRIPTION_localedef = "eglibc: compile locale definition files" FILES_eglibc-gconv = "${libdir}/gconv/*" +FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" +LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" + do_install () { - cp -fpPR ${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} - cp -fpPR ${D}/SUPPORTED ${WORKDIR} + mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} + cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} + cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + cp -fpPR ${LOCALETREESRC}/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/glibc/glibc-locale_2.10.1.bb b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb index 60825397a..1ddc40e22 100644 --- a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb @@ -1,4 +1,4 @@ -#INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_DEFAULT_DEPS = "1" LICENSE = "LGPL" BPN = "glibc" @@ -31,22 +31,33 @@ PR = "r1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PROVIDES = "virtual/libc-locale" +PROVIDES = "virtual/libc-locale${PKGSUFFIX}" -PACKAGES = "localedef${PKGSUFFIX}" +PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg" PACKAGES_DYNAMIC = "locale-base-* \ glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" DESCRIPTION_localedef = "glibc: compile locale definition files" +FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" +FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" + +LOCALETREESRC = "${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}" + do_install () { - cp -fpPR ${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} - cp -fpPR ${D}/SUPPORTED ${WORKDIR} + mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} + cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} + cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} + cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR} } +inherit libc-package + do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" BBCLASSEXTEND = "nativesdk" |