diff options
-rw-r--r-- | meta/classes/libc-common.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/libc-package.bbclass | 5 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 18 |
4 files changed, 14 insertions, 18 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass index bae0ace890..5e932051a2 100644 --- a/meta/classes/libc-common.bbclass +++ b/meta/classes/libc-common.bbclass | |||
@@ -21,3 +21,10 @@ def get_libc_fpu_setting(bb, d): | |||
21 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | 21 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: |
22 | return "--without-fp" | 22 | return "--without-fp" |
23 | return "" | 23 | return "" |
24 | |||
25 | python populate_packages_prepend () { | ||
26 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | ||
27 | bpn = bb.data.getVar('BPN', d, 1) | ||
28 | bb.data.setVar('PKG_'+bpn, 'libc6', d) | ||
29 | bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d) | ||
30 | } | ||
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index ff92afb179..7cfeb7de45 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -369,9 +369,6 @@ python package_do_split_gconvs () { | |||
369 | # We want to do this indirection so that we can safely 'return' | 369 | # We want to do this indirection so that we can safely 'return' |
370 | # from the called function even though we're prepending | 370 | # from the called function even though we're prepending |
371 | python populate_packages_prepend () { | 371 | python populate_packages_prepend () { |
372 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | ||
373 | bpn = bb.data.getVar('BPN', d, 1) | ||
374 | bb.data.setVar('PKG_'+bpn, 'libc6', d) | ||
375 | bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d) | ||
376 | bb.build.exec_func('package_do_split_gconvs', d) | 372 | bb.build.exec_func('package_do_split_gconvs', d) |
377 | } | 373 | } |
374 | |||
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index c84f03292b..00cccc0175 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc | |||
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | |||
26 | # set "0" for qemu emulation of native localedef for locale generation | 26 | # set "0" for qemu emulation of native localedef for locale generation |
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | 27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" |
28 | 28 | ||
29 | PR = "r2" | 29 | PR = "r16" |
30 | 30 | ||
31 | PKGSUFFIX = "" | 31 | PKGSUFFIX = "" |
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 831835612e..8228484815 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -90,21 +90,13 @@ inherit libc-common | |||
90 | 90 | ||
91 | do_install_locale () { | 91 | do_install_locale () { |
92 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | 92 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} |
93 | install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} | 93 | install -d ${dest} ${dest}${bindir} |
94 | cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} | 94 | cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} |
95 | cp -fpP ${D}${bindir}/localedef ${dest}${bindir} | 95 | cp -fpPR ${D}${libdir} ${dest}${exec_prefix} |
96 | mv ${D}${libdir}/gconv ${dest}${libdir} | 96 | cp -fpPR ${D}${datadir} ${dest}${exec_prefix} |
97 | cp -fpPR ${D}${libdir}/* ${dest}${libdir} | 97 | cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} |
98 | mv ${D}${datadir}/i18n ${dest}${datadir} | ||
99 | cp -fpPR ${D}${datadir}/* ${dest}${datadir} | ||
100 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | 98 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} |
101 | } | 99 | } |
102 | 100 | ||
103 | addtask do_install_locale after do_install before do_populate_sysroot | 101 | addtask do_install_locale after do_install before do_populate_sysroot |
104 | 102 | ||
105 | PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" | ||
106 | |||
107 | eglibc_package_preprocess () { | ||
108 | rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
109 | } | ||
110 | |||