diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 16:41:49 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 16:41:49 +0100 |
| commit | b0dd8f5e71e33bdc2614133a7cbb21426ecee38d (patch) | |
| tree | e4ccb78145841c1c9c8128cd7bb2c216b866d3bf | |
| parent | 54940c388181ffb1483f1d056887fe9270510ff4 (diff) | |
| download | openembedded-core-b0dd8f5e71e33bdc2614133a7cbb21426ecee38d.tar.gz openembedded-core-b0dd8f5e71e33bdc2614133a7cbb21426ecee38d.tar.bz2 openembedded-core-b0dd8f5e71e33bdc2614133a7cbb21426ecee38d.tar.xz openembedded-core-b0dd8f5e71e33bdc2614133a7cbb21426ecee38d.zip | |
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@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 18 | ||||
| -rw-r--r-- | 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 822848481..831835612 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 50880496f..798613180 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" |