diff options
Diffstat (limited to 'classes/glibc-package.bbclass')
| -rw-r--r-- | classes/glibc-package.bbclass | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass index 413ed14931..d47c914b36 100644 --- a/classes/glibc-package.bbclass +++ b/classes/glibc-package.bbclass @@ -7,9 +7,11 @@ # "precompiled" - The binary locale files are pregenerated and already present # "ondevice" - The device will build the locale files upon first boot through the postinst +inherit qemu + GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" -PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-pic glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" INSANE_SKIP_glibc-dbg = True @@ -23,6 +25,7 @@ glibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_condi glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ ${libdir}/gconv/.debug ${libexecdir}/*/.debug" +glibcpicfiles = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${libdir}/*nonshared.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" @@ -35,6 +38,8 @@ FILES_libcidn = "${base_libdir}/libcidn*.so" FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_glibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "${base_sbindir}/sln" +FILES_glibc-pic = "${glibcpicfiles}" +FILES_${PN}-pic = "${glibcpicfiles}" FILES_glibc-dev = "${glibcdevfiles}" FILES_${PN}-dev = "${glibcdevfiles}" FILES_glibc-dbg = "${glibcdbgfiles}" @@ -212,12 +217,6 @@ python package_do_split_gconvs () { bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) def output_locale_binary(name, pkgname, locale, encoding): - target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - if target_arch in ("i486", "i586", "i686"): - target_arch = "i386" - elif target_arch == "powerpc": - target_arch = "ppc" - # This is a hack till linux-libc-headers gets patched for the missing arm syscalls and all arm device kernels as well if bb.data.getVar("DISTRO_NAME", d, 1) == "Angstrom": kernel_ver = "2.6.24" @@ -226,10 +225,9 @@ python package_do_split_gconvs () { else: kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) - if kernel_ver is None: - qemu = "qemu-%s -s 1048576" % target_arch - else: - qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) + qemu = qemu_target_binary(d) + " -s 1048576" + if kernel_ver: + qemu += " -r %s" % (kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") |