commit: 763aeeca3f2d501c84f66ebcf58df8ecd900d508
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 19:13:14 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 19:13:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=763aeeca
Move armv6j from demeter to jiji
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../{stage1-hardfloat.spec => stage1-hardfloat-openrc.spec} | 4 ++--
.../specs/arm/armv6j/{stage1.spec => stage1-openrc.spec} | 4 ++--
.../{stage3-hardfloat.spec => stage3-hardfloat-openrc.spec} | 4 ++--
.../specs/arm/armv6j/{stage3.spec => stage3-openrc.spec} | 4 ++--
tools/catalyst-auto-arm.conf | 13 +++++++------
tools/catalyst-auto-qemu-arm.conf | 8 ++++----
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/releases/specs/arm/armv6j/stage1-hardfloat.spec
b/releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec
similarity index 74%
rename from releases/specs/arm/armv6j/stage1-hardfloat.spec
rename to releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec
index 6cff0f43..51666781 100644
--- a/releases/specs/arm/armv6j/stage1-hardfloat.spec
+++ b/releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv6j_hardfp
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv6j_hardfp-latest
+source_subpath: default/stage3-armv6j_hardfp-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv6j/stage1.spec
b/releases/specs/arm/armv6j/stage1-openrc.spec
similarity index 75%
rename from releases/specs/arm/armv6j/stage1.spec
rename to releases/specs/arm/armv6j/stage1-openrc.spec
index 9ba4f0cf..f906a8a3 100644
--- a/releases/specs/arm/armv6j/stage1.spec
+++ b/releases/specs/arm/armv6j/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv6j
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv6j-latest
+source_subpath: default/stage3-armv6j-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv6j/stage3-hardfloat.spec
b/releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec
similarity index 68%
rename from releases/specs/arm/armv6j/stage3-hardfloat.spec
rename to releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec
index 4cd48c1c..6810e585 100644
--- a/releases/specs/arm/armv6j/stage3-hardfloat.spec
+++ b/releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv6j_hardfp
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j_hardfp-@TIMESTAMP@
+source_subpath: default/stage1-armv6j_hardfp-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv6j/stage3.spec
b/releases/specs/arm/armv6j/stage3-openrc.spec
similarity index 69%
rename from releases/specs/arm/armv6j/stage3.spec
rename to releases/specs/arm/armv6j/stage3-openrc.spec
index 1db2972e..78ee4a4d 100644
--- a/releases/specs/arm/armv6j/stage3.spec
+++ b/releases/specs/arm/armv6j/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv6j
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j-@TIMESTAMP@
+source_subpath: default/stage1-armv6j-openrc-@TIMESTAMP@
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 b6603745..a66e8757 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -15,14 +15,14 @@ SETS="
armv4tl_systemd
armv5tel_openrc
armv5tel_systemd
+ armv6j_hf_openrc
+ armv6j_hf_systemd
+ armv6j_sf_openrc
+ armv6j_sf_systemd
"
-# armv6j_hf
-# armv6j_sf
# armv7a_hf
# armv7a_sf
-# armv6j_hf_systemd
-# armv6j_sf_systemd
# armv7a_hf_systemd
# armv7a_sf_systemd
@@ -33,9 +33,10 @@ SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec
armv4tl/stage3-systemd.sp
SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec
armv5tel/stage3-openrc.spec"
SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec
armv5tel/stage3-systemd.spec"
-SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec"
-SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec"
+SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec
armv6j/stage3-hardfloat-openrc.spec"
SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec
armv6j/stage3-hardfloat-systemd.spec"
+
+SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec
armv6j/stage3-openrc.spec"
SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec
armv6j/stage3-systemd.spec"
SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec"
diff --git a/tools/catalyst-auto-qemu-arm.conf
b/tools/catalyst-auto-qemu-arm.conf
index d791c1db..3b820ce3 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -11,12 +11,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]"
SETS="
- armv6j_hf
- armv6j_sf
armv7a_hf
armv7a_sf
- armv6j_hf_systemd
- armv6j_sf_systemd
armv7a_hf_systemd
armv7a_sf_systemd
"
@@ -25,6 +21,10 @@ SETS="
# armv4tl_systemd
# armv5tel
# armv5tel_systemd
+# armv6j_hf
+# armv6j_sf
+# armv6j_hf_systemd
+# armv6j_sf_systemd
SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec
armv4tl/stage3-systemd.spec"
