Mailinglist Archive: opensuse-buildservice (348 mails)

< Previous Next >
[opensuse-buildservice] [PATCH 4/6] obs-server, webui: update SPARC definitions
  • From: Jan Engelhardt <jengelh@xxxxxxxxxx>
  • Date: Mon, 12 Apr 2010 22:27:53 +0200
  • Message-id: <1271104076-17164-5-git-send-email-jengelh@xxxxxxxxxx>
Practical experience has shown that these changes are needed to have
sparcv9 be built correctly.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx>
---
src/backend/BSConfig.pm.template | 2 ++
src/backend/bs_dispatch | 4 ++--
src/backend/bs_worker | 7 +++++--
src/webui/app/views/project/add_target.rhtml | 2 +-
.../app/views/project/add_target.rhtml.template | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/backend/BSConfig.pm.template b/src/backend/BSConfig.pm.template
index f959968..45d5ae2 100644
--- a/src/backend/BSConfig.pm.template
+++ b/src/backend/BSConfig.pm.template
@@ -76,6 +76,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
diff --git a/src/backend/bs_dispatch b/src/backend/bs_dispatch
index 0960b3f..dc290ad 100755
--- a/src/backend/bs_dispatch
+++ b/src/backend/bs_dispatch
@@ -88,8 +88,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',
'sparc'],
'mips' => ['mips'],
'mips64' => ['mips64', 'mips'],
'local' => ['local'],
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
index 6feb6bd..f779e37 100755
--- a/src/backend/bs_worker
+++ b/src/backend/bs_worker
@@ -106,8 +106,9 @@ my %cando = (
'ia64' => ['ia64'],
's390' => ['s390'],
's390x' => ['s390x', 's390:s390'],
- 'sparc' => ['sparc'],
- 'sparc64' => ['sparc64', 'sparcv9:sparc32', 'sparcv8:sparc32',
'sparc:sparc32'],
+ 'sparc' => ['sparcv8', 'sparc'],
+ # sparcv9 is special and must not use linux32
+ 'sparc64' => ['sparc64v', 'sparc64', 'sparcv9v', 'sparcv9',
'sparcv8:linux32', 'sparc:linux32'],
'mips' => ['mips'],
'mips64' => ['mips64', 'mips:mips32'],
);
@@ -1393,6 +1394,8 @@ sub dobuild {
push @args, '--release', "$release" if defined $release;
push @args, '--debug' if $buildinfo->{'debuginfo'};
push @args, '--arch', $arch;
+ # target can be different from arch (e.g. target=sparcv9, arch=sparc64)
+ push @args, '--target', $target;
push @args, '--jobs', $jobs if $jobs;
push @args, '--reason', "Building $buildinfo->{'package'} for project
'$projid' repository '$repoid' arch '$arch' srcmd5 '$buildinfo->{'srcmd5'}'";
push @args, '--disturl', $disturl;
diff --git a/src/webui/app/views/project/add_target.rhtml
b/src/webui/app/views/project/add_target.rhtml
index 5b60cc0..41d47ae 100644
--- a/src/webui/app/views/project/add_target.rhtml
+++ b/src/webui/app/views/project/add_target.rhtml
@@ -23,7 +23,7 @@
<% [:i586, :x86_64 ].each do |arch| %>
<%= check_box_tag "arch[#{arch}]", "", true %><%=arch%><br>
<% end %>
- <% [:ppc, :ppc64, :armv4l, :armv5el, :armv7el, :sh4 ].each do |arch| %>
+ <% [:ppc, :ppc64, :armv4l, :armv5el, :armv7el, :sh4, sparcv9, :sparc64
].each do |arch| %>
<%= check_box_tag "arch[#{arch}]", "", false %><%=arch%><br>
<% end %>
</td>
diff --git a/src/webui/app/views/project/add_target.rhtml.template
b/src/webui/app/views/project/add_target.rhtml.template
index e67b78b..53d5dc5 100644
--- a/src/webui/app/views/project/add_target.rhtml.template
+++ b/src/webui/app/views/project/add_target.rhtml.template
@@ -20,7 +20,7 @@
</td>
<td valign="top">
<strong>Architectures:</strong><br/>
- <% [:i586, :x86_64, :ppc, :ppc64, :s390, :s390x, :ia64, :sparc,
:sparc64, :mips, :mips64, :armv4l, :armv5el, :armv7el, :sh4 ].each do |arch| %>
+ <% [:i586, :x86_64, :ppc, :ppc64, :s390, :s390x, :ia64, :sparc,
:sparc64, :mips, :mips64, :armv4l, :armv5el, :armv7el, :sh4, :sparcv9, :sparc64
].each do |arch| %>
<%= check_box_tag "arch[#{arch}]", "", true %><%=arch%><br>
<% end %>
</td>
--
1.7.0.4

--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >
Follow Ups
References