commit: be5ca56e3b5af4974efcfa0debfa2473987f71cf
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 14:16:12 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 14:16:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=be5ca56e
Add sparc systemd merged-usr builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/sparc/sparc/systemd-stage1-mu.spec | 12 ++++++++++++
releases/specs/sparc/sparc/systemd-stage3-mu.spec | 10 ++++++++++
releases/specs/sparc/sparc64/systemd-stage1-mu.spec | 12 ++++++++++++
releases/specs/sparc/sparc64/systemd-stage3-mu.spec | 10 ++++++++++
tools/catalyst-auto-sparc64.conf | 8 +++++++-
5 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/releases/specs/sparc/sparc/systemd-stage1-mu.spec
b/releases/specs/sparc/sparc/systemd-stage1-mu.spec
new file mode 100644
index 00000000..2af6a51b
--- /dev/null
+++ b/releases/specs/sparc/sparc/systemd-stage1-mu.spec
@@ -0,0 +1,12 @@
+subarch: sparc
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/sparc/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-sparc-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/sparc/sparc/systemd-stage3-mu.spec
b/releases/specs/sparc/sparc/systemd-stage3-mu.spec
new file mode 100644
index 00000000..d496942a
--- /dev/null
+++ b/releases/specs/sparc/sparc/systemd-stage3-mu.spec
@@ -0,0 +1,10 @@
+subarch: sparc
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/sparc/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-sparc-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/sparc/sparc64/systemd-stage1-mu.spec
b/releases/specs/sparc/sparc64/systemd-stage1-mu.spec
new file mode 100644
index 00000000..a4efb94a
--- /dev/null
+++ b/releases/specs/sparc/sparc64/systemd-stage1-mu.spec
@@ -0,0 +1,12 @@
+subarch: sparc64
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/sparc/17.0/64ul/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-sparc64-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/sparc/sparc64/systemd-stage3-mu.spec
b/releases/specs/sparc/sparc64/systemd-stage3-mu.spec
new file mode 100644
index 00000000..ce74d020
--- /dev/null
+++ b/releases/specs/sparc/sparc64/systemd-stage3-mu.spec
@@ -0,0 +1,10 @@
+subarch: sparc64
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/sparc/17.0/64ul/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-sparc64-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index fc346e21..668fc265 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,7 +5,7 @@ UPLOAD_USER=sparc
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
-SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec
sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec
sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
+SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec
sparc/systemd-stage3.spec sparc/systemd-stage1-mu.spec
sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec
sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec
sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
@@ -44,12 +44,18 @@ post_build() {
sparc/systemd-stage3.spec)
upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
;;
+ sparc/systemd-stage3-mu.spec)
+ upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
sparc64/stage3.spec)
upload stage3-sparc64-${TIMESTAMP}*.xz*
;;
sparc64/systemd-stage3.spec)
upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
;;
+ sparc64/systemd-stage3-mu.spec)
+ upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
