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.

(From OE-Core rev: 1a3a76e4652b95b640c287cb3672ccc146b023ca)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 17 insertions, 6 deletions

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 60825397a5..1ddc40e228 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"