| 1 |
commit: 229d1ce7a2f6d30e5b22fce68c1bc77d3aff99d6 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 29 13:48:18 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 29 13:54:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=229d1ce7 |
| 7 |
|
| 8 |
Start with native armv4tl build, introduce openrc suffix |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
.../armv4tl/{stage1.spec => stage1-openrc.spec} | 4 +-- |
| 13 |
.../armv4tl/{stage3.spec => stage3-openrc.spec} | 4 +-- |
| 14 |
tools/catalyst-auto-arm.conf | 30 ++++++++++++---------- |
| 15 |
3 files changed, 20 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/specs/arm/armv4tl/stage1.spec b/releases/specs/arm/armv4tl/stage1-openrc.spec |
| 18 |
similarity index 75% |
| 19 |
rename from releases/specs/arm/armv4tl/stage1.spec |
| 20 |
rename to releases/specs/arm/armv4tl/stage1-openrc.spec |
| 21 |
index 76b3fbbe..f369cb6d 100644 |
| 22 |
--- a/releases/specs/arm/armv4tl/stage1.spec |
| 23 |
+++ b/releases/specs/arm/armv4tl/stage1-openrc.spec |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
subarch: armv4tl |
| 26 |
-version_stamp: @TIMESTAMP@ |
| 27 |
+version_stamp: openrc-@TIMESTAMP@ |
| 28 |
target: stage1 |
| 29 |
rel_type: default |
| 30 |
profile: default/linux/arm/17.0/armv4t |
| 31 |
snapshot: @TIMESTAMP@ |
| 32 |
-source_subpath: default/stage3-armv4tl-latest |
| 33 |
+source_subpath: default/stage3-armv4tl-latest-openrc |
| 34 |
compression_mode: pixz_x |
| 35 |
update_seed: yes |
| 36 |
update_seed_command: -uDN @world |
| 37 |
|
| 38 |
diff --git a/releases/specs/arm/armv4tl/stage3.spec b/releases/specs/arm/armv4tl/stage3-openrc.spec |
| 39 |
similarity index 69% |
| 40 |
rename from releases/specs/arm/armv4tl/stage3.spec |
| 41 |
rename to releases/specs/arm/armv4tl/stage3-openrc.spec |
| 42 |
index c606c2f8..61d68ff5 100644 |
| 43 |
--- a/releases/specs/arm/armv4tl/stage3.spec |
| 44 |
+++ b/releases/specs/arm/armv4tl/stage3-openrc.spec |
| 45 |
@@ -1,10 +1,10 @@ |
| 46 |
subarch: armv4tl |
| 47 |
-version_stamp: @TIMESTAMP@ |
| 48 |
+version_stamp: openrc-@TIMESTAMP@ |
| 49 |
target: stage3 |
| 50 |
rel_type: default |
| 51 |
profile: default/linux/arm/17.0/armv4t |
| 52 |
snapshot: @TIMESTAMP@ |
| 53 |
-source_subpath: default/stage1-armv4tl-@TIMESTAMP@ |
| 54 |
+source_subpath: default/stage1-armv4tl-@TIMESTAMP@-openrc |
| 55 |
compression_mode: pixz_x |
| 56 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 57 |
portage_prefix: releng |
| 58 |
|
| 59 |
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf |
| 60 |
index 643fd258..0dccfbbb 100644 |
| 61 |
--- a/tools/catalyst-auto-arm.conf |
| 62 |
+++ b/tools/catalyst-auto-arm.conf |
| 63 |
@@ -11,21 +11,23 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm |
| 64 |
EMAIL_SUBJECT_PREPEND="[arm-auto]" |
| 65 |
|
| 66 |
SETS=" |
| 67 |
- armv4tl |
| 68 |
- armv5tel |
| 69 |
- armv6j_hf |
| 70 |
- armv6j_sf |
| 71 |
- armv7a_hf |
| 72 |
- armv7a_sf |
| 73 |
+ armv4tl_openrc |
| 74 |
armv4tl_systemd |
| 75 |
- armv5tel_systemd |
| 76 |
- armv6j_hf_systemd |
| 77 |
- armv6j_sf_systemd |
| 78 |
- armv7a_hf_systemd |
| 79 |
- armv7a_sf_systemd |
| 80 |
" |
| 81 |
|
| 82 |
-SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec" |
| 83 |
+# armv5tel |
| 84 |
+# armv6j_hf |
| 85 |
+# armv6j_sf |
| 86 |
+# armv7a_hf |
| 87 |
+# armv7a_sf |
| 88 |
+# armv5tel_systemd |
| 89 |
+# armv6j_hf_systemd |
| 90 |
+# armv6j_sf_systemd |
| 91 |
+# armv7a_hf_systemd |
| 92 |
+# armv7a_sf_systemd |
| 93 |
+ |
| 94 |
+ |
| 95 |
+SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" |
| 96 |
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" |
| 97 |
|
| 98 |
SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec" |
| 99 |
@@ -61,8 +63,8 @@ post_build() { |
| 100 |
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
| 101 |
|
| 102 |
case ${spec} in |
| 103 |
- armv4tl/stage3.spec) |
| 104 |
- upload stage3-armv4tl-${TIMESTAMP}*.xz* |
| 105 |
+ armv4tl/stage3-openrc.spec) |
| 106 |
+ upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz* |
| 107 |
;; |
| 108 |
armv4tl/stage3-systemd.spec) |
| 109 |
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz* |
Archives