summaryrefslogtreecommitdiffstats
path: root/meta/classes
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/classes
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/classes')
-rw-r--r--meta/classes/libc-package.bbclass7
1 files changed, 4 insertions, 3 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() {