Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 2edbc23e880be0c273cf9d793e1f29da0ce21685 Mon Sep 17 00:00:00 2001
From: hudeng <hudeng>
Date: Tue, 14 Nov 2023 02:39:44 +0000
Subject: [PATCH] fix: Obs api service does not recognize sw_64 architecture

---
api/db/seeds.rb | 2 +-
docs/api/obs.rng | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/db/seeds.rb b/api/db/seeds.rb
index f08cb15..b9ec49a 100644
--- a/api/db/seeds.rb
+++ b/api/db/seeds.rb
@@ -6,7 +6,7 @@ puts 'Seeding architectures table...'
['aarch64', 'aarch64_ilp32', 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el',
'armv7hl', 'armv8el', 'hppa', 'i586', 'i686', 'ia64', 'k1om', 'local', 'm68k', 'mips', 'mips32',
'mips64', 'ppc', 'ppc64', 'ppc64p7', 'ppc64le', 'riscv64', 's390', 's390x', 'sparc', 'sparc64', 'sparc64v',
- 'sparcv8', 'sparcv9', 'sparcv9v', 'x86_64', 'loong64', 'mips64el'].each do |arch_name|
+ 'sparcv8', 'sparcv9', 'sparcv9v', 'x86_64', 'loong64', 'mips64el', 'sw64'].each do |arch_name|
Architecture.where(name: arch_name).first_or_create
end
# following our default config
diff --git a/docs/api/obs.rng b/docs/api/obs.rng
index c3ae6cd..8c4bcc4 100644
--- a/docs/api/obs.rng
+++ b/docs/api/obs.rng
@@ -66,6 +66,8 @@

<value>loongarch64</value>

+ <value>sw64</value>
+
<value>local</value>
</choice>
</define>
--
2.35.3
2 changes: 2 additions & 0 deletions services/obs/backend/backend-it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,8 @@ data:
<arch>x86_64</arch>
<arch>riscv64</arch>
<arch>loong64</arch>
<arch>mips64el</arch>
<arch>sw64</arch>
</schedulers>
<unlisted_projects_filter>^home:.+</unlisted_projects_filter>
<unlisted_projects_filter_description>home projects</unlisted_projects_filter_description>
Expand Down
1 change: 1 addition & 0 deletions services/obs/backend/backend-v25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ data:
<arch>riscv64</arch>
<arch>loong64</arch>
<arch>mips64el</arch>
<arch>sw64</arch>
</schedulers>
<unlisted_projects_filter>^home:.+</unlisted_projects_filter>
<unlisted_projects_filter_description>home projects</unlisted_projects_filter_description>
Expand Down
38 changes: 38 additions & 0 deletions services/obs/backend/patches/0013-feat-Add-sw-arch-support.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 170dafb07927ac1fbb66a8e87d081819ec0b0fce Mon Sep 17 00:00:00 2001
From: hudeng <hudeng@deepin.org>
Date: Fri, 11 Oct 2024 03:13:33 +0000
Subject: [PATCH] feat: Add sw arch support

---
BSCando.pm | 2 ++
bs_publish | 2 ++
2 files changed, 4 insertions(+)

diff --git a/BSCando.pm b/BSCando.pm
index 82b5b25..f83bd9d 100644
--- a/BSCando.pm
+++ b/BSCando.pm
@@ -69,6 +69,8 @@ our %cando = (
'mips64' => [ 'mips64', 'mips:mips32' ],
'loong64' => [ 'loong64', 'loongarch64' ],
'loongarch64' => [ 'loong64', 'loongarch64' ],
+ 'sw_64' => [ 'sw_64', 'sw64' ],
+ 'sw64' => [ 'sw_64', 'sw64' ],

'm68k' => [ 'm68k' ],

diff --git a/bs_publish b/bs_publish
index 2e1f722..c2de29b 100755
--- a/bs_publish
+++ b/bs_publish
@@ -907,6 +907,8 @@ ARCH.ppc64le ppc64le noarch
ARCH.ppc ppc noarch
ARCH.riscv64 riscv64 noarch
ARCH.loong64 loong64 loongarch64 noarch
+ARCH.sw_64 sw_64 sw64 noarch
+ARCH.sw64 sw64 sw_64 noarch
ARCH.sh4 sh4 noarch
ARCH.m68k m68k noarch
ARCH.aarch64 aarch64 aarch64_ilp32 noarch
--
2.35.3
Loading