summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 13:04:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 14:28:03 +0100
commit0401f4195875cf1aee390a23c832758a99871cb2 (patch)
treec8772dc488a93f483fc8084b2ad100ada162c61a /meta
parent2894dfb8bf007667dc445f55a2ae76d73a65c564 (diff)
downloadpoky-0401f4195875cf1aee390a23c832758a99871cb2.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-package.bbclass7
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc22
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.10.1.bb23
3 files changed, 36 insertions, 16 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 4bc58c8e57..ff92afb179 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -80,21 +80,22 @@ rm -rf ${TMP_LOCALE}
80 80
81 81
82TMP_LOCALE="/tmp/locale${libdir}/locale" 82TMP_LOCALE="/tmp/locale${libdir}/locale"
83LOCALETREESRC ?= "{PKGD}"
83 84
84do_prep_locale_tree() { 85do_prep_locale_tree() {
85 treedir=${WORKDIR}/locale-tree 86 treedir=${WORKDIR}/locale-tree
86 rm -rf $treedir 87 rm -rf $treedir
87 mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${libdir}/locale 88 mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${libdir}/locale
88 tar -cf - -C ${PKGD}${datadir} -ps i18n | tar -xf - -C $treedir/${datadir} 89 tar -cf - -C ${LOCALETREESRC}${datadir} -ps i18n | tar -xf - -C $treedir/${datadir}
89 # unzip to avoid parsing errors 90 # unzip to avoid parsing errors
90 for i in $treedir/${datadir}/i18n/charmaps/*gz; do 91 for i in $treedir/${datadir}/i18n/charmaps/*gz; do
91 gunzip $i 92 gunzip $i
92 done 93 done
93 tar -cf - -C ${PKGD}${base_libdir} -ps . | tar -xf - -C $treedir/${base_libdir} 94 tar -cf - -C ${LOCALETREESRC}${base_libdir} -ps . | tar -xf - -C $treedir/${base_libdir}
94 if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then 95 if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then
95 tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -ps libgcc_s.* | tar -xf - -C $treedir/${base_libdir} 96 tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -ps libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
96 fi 97 fi
97 install -m 0755 ${PKGD}${bindir}/localedef $treedir/${base_bindir} 98 install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir}
98} 99}
99 100
100do_collect_bins_from_locale_tree() { 101do_collect_bins_from_locale_tree() {
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 7c4b1d501d..c84f03292b 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"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r1" 29PR = "r2"
30 30
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
33 33
34PACKAGES = "localedef${PKGSUFFIX}" 34PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
35
36PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg"
35 37
36PACKAGES_DYNAMIC = "locale-base-* \ 38PACKAGES_DYNAMIC = "locale-base-* \
37 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ 39 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
38 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" 40 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
39 41
40PROVIDES = "virtual/libc-locale${PKGSUFFIX}" 42DESCRIPTION_localedef = "eglibc: compile locale definition files"
41 43
42FILES_eglibc-gconv = "${libdir}/gconv/*" 44FILES_eglibc-gconv = "${libdir}/gconv/*"
45FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
43FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" 46FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
44 47
48LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
49
45do_install () { 50do_install () {
46 cp -fpPR ${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} 51 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
47 cp -fpPR ${D}/SUPPORTED ${WORKDIR} 52 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
53 cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir}
54 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
55 cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
56 cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
57 cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
48} 58}
49 59
50DESCRIPTION_localedef = "eglibc: compile locale definition files"
51
52inherit libc-package 60inherit libc-package
53 61
54do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" 62do_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 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 @@
1#INHIBIT_DEFAULT_DEPS = "1" 1INHIBIT_DEFAULT_DEPS = "1"
2LICENSE = "LGPL" 2LICENSE = "LGPL"
3 3
4BPN = "glibc" 4BPN = "glibc"
@@ -31,22 +31,33 @@ PR = "r1"
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
33 33
34PROVIDES = "virtual/libc-locale" 34PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
35 35
36PACKAGES = "localedef${PKGSUFFIX}" 36PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg"
37 37
38PACKAGES_DYNAMIC = "locale-base-* \ 38PACKAGES_DYNAMIC = "locale-base-* \
39 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" 39 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
40 40
41FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
42 41
43DESCRIPTION_localedef = "glibc: compile locale definition files" 42DESCRIPTION_localedef = "glibc: compile locale definition files"
44 43
44FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
45FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
46
47LOCALETREESRC = "${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}"
48
45do_install () { 49do_install () {
46 cp -fpPR ${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}/* ${D} 50 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
47 cp -fpPR ${D}/SUPPORTED ${WORKDIR} 51 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
52 cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir}
53 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
54 cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
55 cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
56 cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
48} 57}
49 58
59inherit libc-package
60
50do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot" 61do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot"
51 62
52BBCLASSEXTEND = "nativesdk" 63BBCLASSEXTEND = "nativesdk"