diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2010-04-21 11:11:52 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2010-04-26 11:36:00 -0500 |
| commit | 746d3f145c5d890aa63e00a8261ee5934733eaac (patch) | |
| tree | c2e5031d32e60335094b01efe804b4445337bcc9 /classes/glibc-package.bbclass | |
| parent | 2b0109cdd8be5a58d230db249da51abf617d2ca0 (diff) | |
qemu: Move gcc version check, qemu-TARGET logic into qemu.bbclass
Move the logic to determine what qemu-TARGET to run into qemu.bbclass so
we can check for the right binary in sanity.bbclass. This code was
duplicated by glibc-package and eglibc-package anyhow and with the new fn
we can clean up the usage in these classes a bit. Now that we have a class
for qemu stuff, and the gcc check is just for qemu, move it there.
Conflicts:
classes/base.bbclass
classes/sanity.bbclass
Diffstat (limited to 'classes/glibc-package.bbclass')
| -rw-r--r-- | classes/glibc-package.bbclass | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass index 413ed14931..90b9bfd584 100644 --- a/classes/glibc-package.bbclass +++ b/classes/glibc-package.bbclass @@ -7,6 +7,8 @@ # "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" @@ -212,12 +214,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 +222,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") |