[opensuse-buildservice] obs-server: SPARC porting for 1.9.91
The following changes since commit 2f48e6b96ab048e0ec431c4e1cba4a353f337fff: handle missing package error correctly (2010-05-28 16:19:46 +0200) are available in the git repository at: git://dev.medozas.de/suse-build-service master Jan Engelhardt (4): bs_worker: force use of --target for SPARC bsconfig: update relsync for sparc64 bs_sched: rectify SPARC architecture compatibility definitions webui: remaining sparclets Please inspect and apply if ok. For p#1: While the use of --target has raised some concerns, it is ultimately required for sparcv9 building right now, and as openSUSE.org is not using that architecture at all, I guess I get the say :-) dist/sysconfig.obs-server | 2 +- docs/api/api/obs.rng | 2 ++ src/backend/BSConfig.pm.template | 2 ++ src/backend/bs_dispatch | 4 ++-- src/backend/bs_worker | 7 +++++-- 5 files changed, 12 insertions(+), 5 deletions(-) -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
rpmbuild's --target usually defaults to how rpm was configured with (e.g. i586-suse-linux-gnu, x86_64-suse-linux-gnu, sparc64-suse-linux-gnu). For SPARCv9 however, we must pass in --target=sparcv9. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- src/backend/bs_worker | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/backend/bs_worker b/src/backend/bs_worker index 2039755..de8f9ff 100755 --- a/src/backend/bs_worker +++ b/src/backend/bs_worker @@ -1420,6 +1420,9 @@ sub dobuild { push @args, '--release', "$release" if defined $release; push @args, '--debug' if $buildinfo->{'debuginfo'}; push @args, '--arch', $arch; + if (substr($arch, 0, 5) eq "sparc") { + push(@args, "--target", $arch); + } push @args, '--jobs', $jobs if $jobs; push @args, '--reason', "Building $packid for project '$projid' repository '$repoid' arch '$arch' srcmd5 '$buildinfo->{'srcmd5'}'"; push @args, '--disturl', $disturl; -- 1.7.1 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Mon, May 31, 2010 at 06:04:24PM +0200, Jan Engelhardt wrote:
rpmbuild's --target usually defaults to how rpm was configured with (e.g. i586-suse-linux-gnu, x86_64-suse-linux-gnu, sparc64-suse-linux-gnu). For SPARCv9 however, we must pass in --target=sparcv9.
Then please put a "Target:" line in your project config. (Maybe surrounded by some %ifarch.) Thanks, Michael. -- Michael Schroeder mls@suse.de SUSE LINUX Products GmbH, GF Markus Rex, HRB 16746 AG Nuernberg main(_){while(_=~getchar())putchar(~_-1/(~(_|32)/13*2-11)*13);} -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Monday 2010-05-31 20:00, Michael Schroeder wrote:
On Mon, May 31, 2010 at 06:04:24PM +0200, Jan Engelhardt wrote:
rpmbuild's --target usually defaults to how rpm was configured with (e.g. i586-suse-linux-gnu, x86_64-suse-linux-gnu, sparc64-suse-linux-gnu). For SPARCv9 however, we must pass in --target=sparcv9.
Then please put a "Target:" line in your project config. (Maybe surrounded by some %ifarch.)
Can you still please pick up the other three patches? -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Mon, Jun 07, 2010 at 04:53:17PM +0200, Jan Engelhardt wrote:
On Monday 2010-05-31 20:00, Michael Schroeder wrote:
On Mon, May 31, 2010 at 06:04:24PM +0200, Jan Engelhardt wrote:
rpmbuild's --target usually defaults to how rpm was configured with (e.g. i586-suse-linux-gnu, x86_64-suse-linux-gnu, sparc64-suse-linux-gnu). For SPARCv9 however, we must pass in --target=sparcv9.
Then please put a "Target:" line in your project config. (Maybe surrounded by some %ifarch.)
Can you still please pick up the other three patches?
I already committed them this morning. Cheers, Michael. -- Michael Schroeder mls@suse.de SUSE LINUX Products GmbH, GF Markus Rex, HRB 16746 AG Nuernberg main(_){while(_=~getchar())putchar(~_-1/(~(_|32)/13*2-11)*13);} -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- src/backend/BSConfig.pm.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/backend/BSConfig.pm.template b/src/backend/BSConfig.pm.template index 423b998..63b9b21 100644 --- a/src/backend/BSConfig.pm.template +++ b/src/backend/BSConfig.pm.template @@ -77,6 +77,8 @@ our $relsync_pool = { "armv6el" => "armv6el", "armv7el" => "armv7el", "armv8el" => "armv8el", + "sparcv9" => "sparcv9", + "sparc64" => "sparc64", }; # This is for prefer a project in scheduler, if it has high or medium -- 1.7.1 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
SPARCv9 target must not be run with linux32. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- src/backend/bs_dispatch | 4 ++-- src/backend/bs_worker | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/bs_dispatch b/src/backend/bs_dispatch index 9652088..954fb84 100755 --- a/src/backend/bs_dispatch +++ b/src/backend/bs_dispatch @@ -98,8 +98,8 @@ my %cando = ( 'ia64' => ['ia64'], 's390' => ['s390'], 's390x' => ['s390x', 's390'], - 'sparc' => ['sparc'], - 'sparc64' => ['sparc64', 'sparcv9:sparc32', 'sparcv8:sparc32', 'sparc:sparc32'], + 'sparc' => ['sparcv8', 'sparc'], + 'sparc64' => ['sparc64v', 'sparc64', 'sparcv9v', 'sparcv9', 'sparcv8:linux32', 'sparc:linux32'], 'mips' => ['mips'], 'mips64' => ['mips64', 'mips'], 'local' => ['local'], diff --git a/src/backend/bs_worker b/src/backend/bs_worker index de8f9ff..bb89697 100755 --- a/src/backend/bs_worker +++ b/src/backend/bs_worker @@ -107,8 +107,8 @@ my %cando = ( 'ia64' => ['ia64'], 's390' => ['s390'], 's390x' => ['s390x', 's390:s390'], - 'sparc' => ['sparc'], - 'sparc64' => ['sparc64', 'sparcv9:sparc32', 'sparcv8:sparc32', 'sparc:sparc32'], + 'sparc' => ['sparcv8', 'sparc'], + 'sparc64' => ['sparc64v', 'sparc64', 'sparcv9v', 'sparcv9', 'sparcv8:linux32', 'sparc:linux32'], 'mips' => ['mips'], 'mips64' => ['mips64', 'mips:mips32'], ); -- 1.7.1 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Please check this for correctness. We may also need something in the DB update scripts. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- dist/sysconfig.obs-server | 2 +- docs/api/api/obs.rng | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dist/sysconfig.obs-server b/dist/sysconfig.obs-server index 670bbe9..9898792 100644 --- a/dist/sysconfig.obs-server +++ b/dist/sysconfig.obs-server @@ -1,6 +1,6 @@ ## Path: Applications/OBS ## Description: define for which architectures the packages should get build -## Type: regexp((i586|x86_64|ppc|ppc64|s390|s390x|ia64|sparc|sparc64|mips|mips64|armv4l|armv5el|armv6el|armv7el|armv8el|sh4)+) +## Type: regexp((i586|x86_64|ppc|ppc64|s390|s390x|ia64|sparc|sparcv8|sparcv9|sparcv9v|sparc64|sparc64v|mips|mips64|armv4l|armv5el|armv6el|armv7el|armv8el|sh4)+) ## Default: "i586 x86_64" ## Config: OBS # diff --git a/docs/api/api/obs.rng b/docs/api/api/obs.rng index 48496fe..ffc0b66 100644 --- a/docs/api/api/obs.rng +++ b/docs/api/api/obs.rng @@ -30,8 +30,10 @@ <value>sh4</value> <value>sparc</value> <value>sparc64</value> + <value>sparc64v</value> <value>sparcv8</value> <value>sparcv9</value> + <value>sparcv9v</value> <value>x86_64</value> <value>local</value> </choice> -- 1.7.1 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (2)
-
Jan Engelhardt -
Michael Schroeder