* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/arm/armv7a/
@ 2021-08-30 8:54 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2021-08-30 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 93449eee1f213983d831adabdabf38349c81f6b9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 08:54:34 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 08:54:34 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=93449eee
Also build armv7a on jiji
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...hardfloat.spec => stage1-hardfloat-openrc.spec} | 4 ++--
.../arm/armv7a/{stage1.spec => stage1-openrc.spec} | 4 ++--
...hardfloat.spec => stage3-hardfloat-openrc.spec} | 4 ++--
.../arm/armv7a/{stage3.spec => stage3-openrc.spec} | 4 ++--
tools/catalyst-auto-arm.conf | 24 ++++++++++------------
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/releases/specs/arm/armv7a/stage1-hardfloat.spec b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec
similarity index 74%
rename from releases/specs/arm/armv7a/stage1-hardfloat.spec
rename to releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec
index a4c888fd..d7519391 100644
--- a/releases/specs/arm/armv7a/stage1-hardfloat.spec
+++ b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv7a_hardfp
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv7a_hardfp-latest
+source_subpath: default/stage3-armv7a_hardfp-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv7a/stage1.spec b/releases/specs/arm/armv7a/stage1-openrc.spec
similarity index 75%
rename from releases/specs/arm/armv7a/stage1.spec
rename to releases/specs/arm/armv7a/stage1-openrc.spec
index db9e62ff..9c585823 100644
--- a/releases/specs/arm/armv7a/stage1.spec
+++ b/releases/specs/arm/armv7a/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv7a
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-armv7a-latest
+source_subpath: default/stage3-armv7a-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs/arm/armv7a/stage3-hardfloat.spec b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec
similarity index 68%
rename from releases/specs/arm/armv7a/stage3-hardfloat.spec
rename to releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec
index a418e902..95d55e85 100644
--- a/releases/specs/arm/armv7a/stage3-hardfloat.spec
+++ b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv7a_hardfp
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a_hardfp-@TIMESTAMP@
+source_subpath: default/stage1-armv7a_hardfp-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm/armv7a/stage3.spec b/releases/specs/arm/armv7a/stage3-openrc.spec
similarity index 69%
rename from releases/specs/arm/armv7a/stage3.spec
rename to releases/specs/arm/armv7a/stage3-openrc.spec
index 037dcbd3..b4302c62 100644
--- a/releases/specs/arm/armv7a/stage3.spec
+++ b/releases/specs/arm/armv7a/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: armv7a
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a-@TIMESTAMP@
+source_subpath: default/stage1-armv7a-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 9f472845..27e86522 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,6 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
+ armv7a_hf_openrc
+ armv7a_hf_systemd
+ armv7a_sf_openrc
+ armv7a_sf_systemd
armv4tl_openrc
armv4tl_systemd
armv5tel_openrc
@@ -21,12 +25,6 @@ SETS="
armv6j_sf_systemd
"
-# armv7a_hf
-# armv7a_sf
-# 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"
@@ -39,11 +37,11 @@ SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-
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"
-SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec"
+SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
-SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
+SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec"
+SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
@@ -76,25 +74,25 @@ post_build() {
armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
- armv6j/stage3.spec)
+ armv6j/stage3-openrc.spec)
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd.spec)
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
- armv6j/stage3-hardfloat.spec)
+ armv6j/stage3-hardfloat-openrc.spec)
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
- armv7a/stage3.spec)
+ armv7a/stage3-openrc.spec)
upload stage3-armv7a-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd.spec)
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
- armv7a/stage3-hardfloat.spec)
+ armv7a/stage3-hardfloat-openrc.spec)
upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-30 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-30 8:54 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/arm/armv7a/ Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox