sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

glibc/eglibc: Clean up package warnings and potentially broken data in -dev package 

These changes ensure files packaged in the -locale package aren't included
in the main do_install and also ensures the staging directory used for
the -locale package doesn't end up in the -dev package.

(From OE-Core rev: 2dccb370e04bc2bbe208b2b0541077d8ef519535)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-06-29 13:35:00 +01:00
parent 0401f41958
commit 8bdb4de37c
5 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-core/eglibc/eglibc-package.inc
View File

@ -90,13 +90,21 @@ inherit libc-common
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}
install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
mv ${D}${libdir}/gconv ${dest}${libdir}
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
mv ${D}${datadir}/i18n ${dest}${datadir}
cp -fpPR ${D}${datadir}/* ${dest}${datadir}
cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
}
addtask do_install_locale after do_install before do_populate_sysroot
PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
eglibc_package_preprocess () {
rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
}

2
meta/recipes-core/eglibc/eglibc_2.12.bb
View File

@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
PR = "r16"
PR = "r17"
SRCREV = "14158"

2
meta/recipes-core/eglibc/eglibc_2.13.bb
View File

@ -4,7 +4,7 @@ SRCREV = "14157"
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
PR = "r3"
PR = "r4"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"

20
meta/recipes-core/glibc/glibc-package.inc
View File

@ -74,3 +74,23 @@ EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
inherit libc-common
do_install_locale () {
dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}
install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
mv ${D}${libdir}/gconv ${dest}${libdir}
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
mv ${D}${datadir}/i18n ${dest}${datadir}
cp -fpPR ${D}${datadir}/* ${dest}${datadir}
cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
}
addtask do_install_locale after do_install before do_populate_sysroot
PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
glibc_package_preprocess () {
rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
}

12
meta/recipes-core/glibc/glibc_2.10.1.bb
View File

@ -154,18 +154,6 @@ 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