commit: 229d1ce7a2f6d30e5b22fce68c1bc77d3aff99d6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 13:48:18 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 13:54:42 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=229d1ce7
Start with native armv4tl build, introduce openrc suffix
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../armv4tl/{stage1.spec => stage1-openrc.spec} | 4 +--
.../armv4tl/{stage3.spec => stage3-openrc.spec} | 4 +--
tools/catalyst-auto-arm.conf | 30 ++++++++++++----------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/releases/specs/arm/armv4tl/stage1.spec
b/releases/specs/arm/armv4tl/stage1-openrc.spec
similarity index 75%
rename from releases/specs/arm/armv4tl/stage1.spec
rename to releases/specs/arm/armv4tl/stage1-openrc.spec
index 76b3fbbe..f369cb6d 100644
--- a/releases/specs/arm/armv4tl/stage1.spec
+++ b/releases/specs/arm/armv4tl/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv4tl
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/arm/17.0/armv4t
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv4tl-latest
+source_subpath: default/stage3-armv4tl-latest-openrc
compression_mode: pixz_x
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv4tl/stage3.spec
b/releases/specs/arm/armv4tl/stage3-openrc.spec
similarity index 69%
rename from releases/specs/arm/armv4tl/stage3.spec
rename to releases/specs/arm/armv4tl/stage3-openrc.spec
index c606c2f8..61d68ff5 100644
--- a/releases/specs/arm/armv4tl/stage3.spec
+++ b/releases/specs/arm/armv4tl/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv4tl
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv4t
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv4tl-@TIMESTAMP@
+source_subpath: default/stage1-armv4tl-@TIMESTAMP@-openrc
compression_mode: pixz_x
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 643fd258..0dccfbbb 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,21 +11,23 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
- armv4tl
- armv5tel
- armv6j_hf
- armv6j_sf
- armv7a_hf
- armv7a_sf
+ armv4tl_openrc
armv4tl_systemd
- armv5tel_systemd
- armv6j_hf_systemd
- armv6j_sf_systemd
- armv7a_hf_systemd
- armv7a_sf_systemd
"
-SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
+# armv5tel
+# armv6j_hf
+# armv6j_sf
+# armv7a_hf
+# armv7a_sf
+# armv5tel_systemd
+# armv6j_hf_systemd
+# armv6j_sf_systemd
+# armv7a_hf_systemd
+# armv7a_sf_systemd
+
+
+SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec
armv4tl/stage3-systemd.spec"
SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec"
@@ -61,8 +63,8 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- armv4tl/stage3.spec)
- upload stage3-armv4tl-${TIMESTAMP}*.xz*
+ armv4tl/stage3-openrc.spec)
+ upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
;;
armv4tl/stage3-systemd.spec)
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*