From 6ae10228b8e0bf11379edd8c51c096958bdfd94d Mon Sep 17 00:00:00 2001 From: Martin Mohring Date: Sat, 10 Apr 2010 16:50:15 +0200 Subject: [PATCH] changed: cross build emulation strings in build and osc are now same --- NEWS | 3 ++- osc/build.py | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 17fe9bbc..1d737981 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 0.126 - - added VM diskimage autosetup hooks to osc + - added VM autosetup to osc. This requires appropriate OBS version and build script version. + - enhanced QEMU cross build support with 'armv4l' 'armv5el' 'armv6el' 'armv7el' 'armv8el' 'mips' 'mips64' 'ppc' 'ppc64' 'sh4' arch strings now supported on x86 host - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy - "osc cat" & "osc ls" now auto-expands through link. - fixed "osc add" after "osc delete". diff --git a/osc/build.py b/osc/build.py index 1ea05766..7c97700b 100644 --- a/osc/build.py +++ b/osc/build.py @@ -32,20 +32,21 @@ change_personality = { } can_also_build = { - 'armv4l': [ 'armv4l' ], - 'armv5el':[ 'armv4l', 'armv5el' ], - 'armv6el':[ 'armv4l', 'armv5el', 'armv6el' ], - 'armv6l' :[ 'armv4l', 'armv5el', 'armv6el' ], - 'armv7el':[ 'armv4l', 'armv5el', 'armv6el', 'armv7el' ], - 'armv7l' :[ 'armv4l', 'armv5el', 'armv6el', 'armv7el' ], - 'armv8el':[ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el'], - 'armv8l' :[ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el'], - 's390x': ['s390' ], - 'ppc64': [ 'ppc', 'ppc64', ], - 'i386': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4' ,'mips' ], - 'i586': [ 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4' ,'mips' ], - 'i686': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4' ,'mips' ], - 'x86_64': ['i686', 'i586', 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4' ,'mips' ], + 'armv4l': [ 'armv4l' ], + 'armv5el':[ 'armv4l', 'armv5el' ], + 'armv6el':[ 'armv4l', 'armv5el', 'armv6el' ], + 'armv6l' :[ 'armv4l', 'armv5el', 'armv6el' ], + 'armv7el':[ 'armv4l', 'armv5el', 'armv6el', 'armv7el' ], + 'armv7l' :[ 'armv4l', 'armv5el', 'armv6el', 'armv7el' ], + 'armv8el':[ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el' ], + 'armv8l' :[ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el' ], + 's390x': ['s390' ], + 'ppc64': [ 'ppc', 'ppc64' ], + 'sh4': [ 'sh4' ], + 'i386': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4', 'mips', 'mips64' ], + 'i586': [ 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4', 'mips', 'mips64' ], + 'i686': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4', 'mips', 'mips64' ], + 'x86_64': ['i686', 'i586', 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el', 'sh4', 'mips', 'mips64' ], } # real arch of this machine