diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-08-13 15:16:58 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-08-13 17:16:19 +0100 |
commit | 1c4cc60e282ef153cbcbbe56bb739912a0e0ea0c (patch) | |
tree | fd36c043c0e8a189c327b98eb3d305572af616f6 /meta/classes/kernel-arch.bbclass | |
parent | 2e0d6df6c198c559db42a3b92b847555f46d1a35 (diff) | |
download | poky-1c4cc60e282ef153cbcbbe56bb739912a0e0ea0c.tar.gz |
kernel-arch: x86-64 is no longer a valid architecture, map it to x86
Also use the exported (and re-mapped) ARCH rather than TARGET_ARCH in the
linux-wrs recipe.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes/kernel-arch.bbclass')
-rw-r--r-- | meta/classes/kernel-arch.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index cf50356da9..d6ae2e71a2 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass | |||
@@ -5,7 +5,7 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | valid_archs = "alpha cris ia64 \ | 7 | valid_archs = "alpha cris ia64 \ |
8 | x86_64 i386 x86 \ | 8 | i386 x86 \ |
9 | m68knommu m68k ppc powerpc ppc64 \ | 9 | m68knommu m68k ppc powerpc ppc64 \ |
10 | sparc sparc64 \ | 10 | sparc sparc64 \ |
11 | arm arm26 \ | 11 | arm arm26 \ |
@@ -19,13 +19,13 @@ def map_kernel_arch(a, d): | |||
19 | 19 | ||
20 | valid_archs = bb.data.getVar('valid_archs', d, 1).split() | 20 | valid_archs = bb.data.getVar('valid_archs', d, 1).split() |
21 | 21 | ||
22 | if re.match('(i.86|athlon)$', a): return 'x86' | 22 | if re.match('(i.86|athlon|x86.64)$', a): return 'x86' |
23 | elif re.match('arm26$', a): return 'arm26' | 23 | elif re.match('arm26$', a): return 'arm26' |
24 | elif re.match('armeb$', a): return 'arm' | 24 | elif re.match('armeb$', a): return 'arm' |
25 | elif re.match('mipsel$', a): return 'mips' | 25 | elif re.match('mipsel$', a): return 'mips' |
26 | elif re.match('sh(3|4)$', a): return 'sh' | 26 | elif re.match('sh(3|4)$', a): return 'sh' |
27 | elif re.match('bfin', a): return 'blackfin' | 27 | elif re.match('bfin', a): return 'blackfin' |
28 | elif a in valid_archs: return a | 28 | elif a in valid_archs: return a |
29 | else: | 29 | else: |
30 | bb.error("cannot map '%s' to a linux kernel architecture" % a) | 30 | bb.error("cannot map '%s' to a linux kernel architecture" % a) |
31 | 31 | ||