[oe-commits] Richard Purdie : eglibc-package.bbclass: Fix unintended code changes
git version control
git at git.openembedded.org
Thu Jun 30 15:45:06 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: b0dd8f5e71e33bdc2614133a7cbb21426ecee38d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b0dd8f5e71e33bdc2614133a7cbb21426ecee38d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Jun 30 16:41:49 2011 +0100
eglibc-package.bbclass: Fix unintended code changes
Commit 477ede7472db0bacd5daacb96e97f849d1be84ee accidentally reverted
some code changes it shouldn't have done leading to continued eglibc
packaging issues. This patch corrects that damage.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/eglibc/eglibc-package.inc | 18 +++++++++++++-----
meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 8228484..8318356 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -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}
+}
+
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 5088049..7986131 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -4,7 +4,7 @@ SRCREV = "14157"
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
-PR = "r4"
+PR = "r5"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
More information about the Openembedded-commits
mailing list