From 2c3437d0ae4beac017663e9e71e923e5aac14c79 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 20 May 2010 15:15:55 +0100 Subject: kernel-arch.bbclass: merge improved arch detection from OE.dev Signed-off-by: Joshua Lock --- meta/classes/kernel-arch.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index 35c26b89ff..8894fa554c 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -32,8 +32,10 @@ def map_kernel_arch(a, d): export ARCH = "${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)}" def map_uboot_arch(a, d): - if a == "powerpc": - return "ppc" + import re + + if re.match('powerpc$', a): return 'ppc' + elif re.match('i.86$', a): return 'x86' return a export UBOOT_ARCH = "${@map_uboot_arch(bb.data.getVar('ARCH', d, 1), d)}" -- cgit 1.2.3-korg