1 |
commit: 922354b18748e172bacd9ab5d7d97b3324ca85c5 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 29 16:58:48 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 29 17:04:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=922354b1 |
7 |
|
8 |
Enable armv5tel builds on jiji |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
.../specs/arm/armv5tel/{stage1.spec => stage1-openrc.spec} | 4 ++-- |
13 |
.../specs/arm/armv5tel/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
14 |
tools/catalyst-auto-arm.conf | 12 ++++++------ |
15 |
3 files changed, 10 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/releases/specs/arm/armv5tel/stage1.spec b/releases/specs/arm/armv5tel/stage1-openrc.spec |
18 |
similarity index 74% |
19 |
rename from releases/specs/arm/armv5tel/stage1.spec |
20 |
rename to releases/specs/arm/armv5tel/stage1-openrc.spec |
21 |
index b6fbe506..666a0cdc 100644 |
22 |
--- a/releases/specs/arm/armv5tel/stage1.spec |
23 |
+++ b/releases/specs/arm/armv5tel/stage1-openrc.spec |
24 |
@@ -1,10 +1,10 @@ |
25 |
subarch: armv5tel |
26 |
-version_stamp: @TIMESTAMP@ |
27 |
+version_stamp: openrc-@TIMESTAMP@ |
28 |
target: stage1 |
29 |
rel_type: default |
30 |
profile: default/linux/arm/17.0/armv5te |
31 |
snapshot: @TIMESTAMP@ |
32 |
-source_subpath: default/stage3-armv5tel-latest |
33 |
+source_subpath: default/stage3-armv5tel-openrc-latest |
34 |
compression_mode: pixz_x |
35 |
update_seed: yes |
36 |
update_seed_command: -uDN @world |
37 |
|
38 |
diff --git a/releases/specs/arm/armv5tel/stage3.spec b/releases/specs/arm/armv5tel/stage3-openrc.spec |
39 |
similarity index 69% |
40 |
rename from releases/specs/arm/armv5tel/stage3.spec |
41 |
rename to releases/specs/arm/armv5tel/stage3-openrc.spec |
42 |
index 98eb714d..51f0f282 100644 |
43 |
--- a/releases/specs/arm/armv5tel/stage3.spec |
44 |
+++ b/releases/specs/arm/armv5tel/stage3-openrc.spec |
45 |
@@ -1,10 +1,10 @@ |
46 |
subarch: armv5tel |
47 |
-version_stamp: @TIMESTAMP@ |
48 |
+version_stamp: openrc-@TIMESTAMP@ |
49 |
target: stage3 |
50 |
rel_type: default |
51 |
profile: default/linux/arm/17.0/armv5te |
52 |
snapshot: @TIMESTAMP@ |
53 |
-source_subpath: default/stage1-armv5tel-@TIMESTAMP@ |
54 |
+source_subpath: default/stage1-armv5tel-openrc-@TIMESTAMP@ |
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 0dccfbbb..b6603745 100644 |
61 |
--- a/tools/catalyst-auto-arm.conf |
62 |
+++ b/tools/catalyst-auto-arm.conf |
63 |
@@ -2,7 +2,7 @@ |
64 |
# self-explanatory. |
65 |
|
66 |
UPLOAD_USER=arm |
67 |
-UPLOAD_KEY=/root/.ssh/id_rsa |
68 |
+UPLOAD_KEY=/root/.ssh/id_ed25519 |
69 |
|
70 |
host=$(hostname) |
71 |
|
72 |
@@ -13,14 +13,14 @@ EMAIL_SUBJECT_PREPEND="[arm-auto]" |
73 |
SETS=" |
74 |
armv4tl_openrc |
75 |
armv4tl_systemd |
76 |
+ armv5tel_openrc |
77 |
+ armv5tel_systemd |
78 |
" |
79 |
|
80 |
-# armv5tel |
81 |
# armv6j_hf |
82 |
# armv6j_sf |
83 |
# armv7a_hf |
84 |
# armv7a_sf |
85 |
-# armv5tel_systemd |
86 |
# armv6j_hf_systemd |
87 |
# armv6j_sf_systemd |
88 |
# armv7a_hf_systemd |
89 |
@@ -30,7 +30,7 @@ SETS=" |
90 |
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" |
91 |
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" |
92 |
|
93 |
-SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec" |
94 |
+SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec" |
95 |
SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec" |
96 |
|
97 |
SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec" |
98 |
@@ -69,8 +69,8 @@ post_build() { |
99 |
armv4tl/stage3-systemd.spec) |
100 |
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz* |
101 |
;; |
102 |
- armv5tel/stage3.spec) |
103 |
- upload stage3-armv5tel-${TIMESTAMP}*.xz* |
104 |
+ armv5tel/stage3-openrc.spec) |
105 |
+ upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz* |
106 |
;; |
107 |
armv5tel/stage3-systemd.spec) |
108 |
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* |