diff options
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 18 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 20 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.10.1.bb | 12 |
5 files changed, 35 insertions, 19 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.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 47b1822ac..60358e179 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r16" +PR = "r17" SRCREV = "14158" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index dfedfef9d..50880496f 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 = "r3" +PR = "r4" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 5373d56d5..c1c38534b 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -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} +} + diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb index 4d57c4ed3..e76f3c019 100644 --- a/meta/recipes-core/glibc/glibc_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc_2.10.1.bb @@ -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 |