commit: 557a127419847dd0213665a20a539b417e7a476e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 11:18:10 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 11:18:10 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=557a1274
Move arm merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/arm/armv4tl/stage1-systemd-mu.spec | 4 +--
releases/specs/arm/armv4tl/stage3-systemd-mu.spec | 4 +--
releases/specs/arm/armv5tel/stage1-systemd-mu.spec | 4 +--
releases/specs/arm/armv5tel/stage3-systemd-mu.spec | 4 +--
.../arm/armv6j/stage1-hardfloat-systemd-mu.spec | 4 +--
releases/specs/arm/armv6j/stage1-systemd-mu.spec | 4 +--
.../arm/armv6j/stage3-hardfloat-systemd-mu.spec | 4 +--
releases/specs/arm/armv6j/stage3-systemd-mu.spec | 4 +--
.../arm/armv7a/stage1-hardfloat-systemd-mu.spec | 4 +--
releases/specs/arm/armv7a/stage1-systemd-mu.spec | 4 +--
.../arm/armv7a/stage3-hardfloat-systemd-mu.spec | 4 +--
releases/specs/arm/armv7a/stage3-systemd-mu.spec | 4 +--
tools/catalyst-auto-arm.conf | 42 ++++++++++++----------
13 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/releases/specs/arm/armv4tl/stage1-systemd-mu.spec
b/releases/specs/arm/armv4tl/stage1-systemd-mu.spec
index 327e3fe6..784943f3 100644
--- a/releases/specs/arm/armv4tl/stage1-systemd-mu.spec
+++ b/releases/specs/arm/armv4tl/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv4tl
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv4t/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv4tl-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv4tl-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv4tl/stage3-systemd-mu.spec
b/releases/specs/arm/armv4tl/stage3-systemd-mu.spec
index dd9d375d..9319254c 100644
--- a/releases/specs/arm/armv4tl/stage3-systemd-mu.spec
+++ b/releases/specs/arm/armv4tl/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv4tl
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv4t/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv4tl-systemd-mergedusr-@timest...@.tar.xz
+source_subpath: mergedusr/stage1-armv4tl-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv5tel/stage1-systemd-mu.spec
b/releases/specs/arm/armv5tel/stage1-systemd-mu.spec
index 0b0a5c1e..1d2d1c68 100644
--- a/releases/specs/arm/armv5tel/stage1-systemd-mu.spec
+++ b/releases/specs/arm/armv5tel/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv5tel
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv5te/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv5tel-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv5tel-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv5tel/stage3-systemd-mu.spec
b/releases/specs/arm/armv5tel/stage3-systemd-mu.spec
index 07a5d2a7..04dacd84 100644
--- a/releases/specs/arm/armv5tel/stage3-systemd-mu.spec
+++ b/releases/specs/arm/armv5tel/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv5tel
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv5te/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv5tel-systemd-mergedusr-@timest...@.tar.xz
+source_subpath: mergedusr/stage1-armv5tel-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec
b/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec
index 2b7bd2fc..3f5ffcbf 100644
--- a/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec
+++ b/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv6j_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv6j_hardfp-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv6j_hardfp-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv6j/stage1-systemd-mu.spec
b/releases/specs/arm/armv6j/stage1-systemd-mu.spec
index be57040d..bb83cac8 100644
--- a/releases/specs/arm/armv6j/stage1-systemd-mu.spec
+++ b/releases/specs/arm/armv6j/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv6j
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv6j-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv6j-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec
b/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec
index bab362d7..03bf3680 100644
--- a/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec
+++ b/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv6j_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath:
default/stage1-armv6j_hardfp-systemd-mergedusr-@timest...@.tar.xz
+source_subpath:
mergedusr/stage1-armv6j_hardfp-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv6j/stage3-systemd-mu.spec
b/releases/specs/arm/armv6j/stage3-systemd-mu.spec
index 1b2c7ed5..efff3b65 100644
--- a/releases/specs/arm/armv6j/stage3-systemd-mu.spec
+++ b/releases/specs/arm/armv6j/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv6j
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j-systemd-mergedusr-@timest...@.tar.xz
+source_subpath: mergedusr/stage1-armv6j-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec
b/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec
index 0516a5bf..11d5e874 100644
--- a/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec
+++ b/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv7a_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv7a_hardfp-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv7a_hardfp-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv7a/stage1-systemd-mu.spec
b/releases/specs/arm/armv7a/stage1-systemd-mu.spec
index 5238adda..efe783e6 100644
--- a/releases/specs/arm/armv7a/stage1-systemd-mu.spec
+++ b/releases/specs/arm/armv7a/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv7a
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv7a-systemd-mergedusr-latest.tar.xz
+source_subpath: mergedusr/stage3-armv7a-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec
b/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec
index 67895086..204f26d4 100644
--- a/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec
+++ b/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv7a_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath:
default/stage1-armv7a_hardfp-systemd-mergedusr-@timest...@.tar.xz
+source_subpath:
mergedusr/stage1-armv7a_hardfp-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv7a/stage3-systemd-mu.spec
b/releases/specs/arm/armv7a/stage3-systemd-mu.spec
index 1dc73acd..103a018b 100644
--- a/releases/specs/arm/armv7a/stage3-systemd-mu.spec
+++ b/releases/specs/arm/armv7a/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: armv7a
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a-systemd-mergedusr-@timest...@.tar.xz
+source_subpath: mergedusr/stage1-armv7a-systemd-mergedusr-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 64791df8..7b9c1a14 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -68,7 +68,7 @@ SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec
armv7a/stage3-syst
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"
; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -91,57 +91,61 @@ post_build() {
armv4tl/stage3-systemd.spec)
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
;;
- armv4tl/stage3-systemd-mu.spec)
- upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
armv5tel/stage3-openrc.spec)
upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
- armv5tel/stage3-systemd-mu.spec)
- upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
armv6j/stage3-openrc.spec)
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd.spec)
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
- armv6j/stage3-systemd-mu.spec)
- upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
armv6j/stage3-hardfloat-openrc.spec)
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
- armv6j/stage3-hardfloat-systemd-mu.spec)
- upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
armv7a/stage3-openrc.spec)
upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd.spec)
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
- armv7a/stage3-systemd-mu.spec)
- upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
armv7a/stage3-hardfloat-openrc.spec)
upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+ esac
+
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+
+ case ${spec} in
+ armv4tl/stage3-systemd-mu.spec)
+ upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3-systemd-mu.spec)
+ upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-systemd-mu.spec)
+ upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat-systemd-mu.spec)
+ upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-systemd-mu.spec)
+ upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
armv7a/stage3-hardfloat-systemd-mu.spec)
upload stage3-armv7a_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
- *)
- echo "Finished ${spec}"
- ;;
esac
popd >/dev/null
