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 /recipes | |
| 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 'recipes')
| -rw-r--r-- | recipes/eglibc/eglibc-package.bbclass | 14 | ||||
| -rw-r--r-- | recipes/qemu/qemu-gcc3-check.inc | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index fcaba47f6e..c5c73682f3 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -6,6 +6,8 @@ # See the note in gcc/gcc_3.4.0.oe # +inherit qemu + python __anonymous () { import bb, re uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) @@ -287,16 +289,10 @@ python package_do_split_gconvs () { bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) def output_locale_binary(name, 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" + qemu = qemu_target_binary(d) + " -s 1048576" 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) + if kernel_ver: + qemu += " -r %s" % (kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: diff --git a/recipes/qemu/qemu-gcc3-check.inc b/recipes/qemu/qemu-gcc3-check.inc index 81c3555b48..c55444acdd 100644 --- a/recipes/qemu/qemu-gcc3-check.inc +++ b/recipes/qemu/qemu-gcc3-check.inc @@ -1,3 +1,5 @@ +inherit qemu + python __anonymous() { from bb import which, data |