1 |
commit: 93449eee1f213983d831adabdabf38349c81f6b9 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 30 08:54:34 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 30 08:54:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=93449eee |
7 |
|
8 |
Also build armv7a on jiji |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
...hardfloat.spec => stage1-hardfloat-openrc.spec} | 4 ++-- |
13 |
.../arm/armv7a/{stage1.spec => stage1-openrc.spec} | 4 ++-- |
14 |
...hardfloat.spec => stage3-hardfloat-openrc.spec} | 4 ++-- |
15 |
.../arm/armv7a/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
16 |
tools/catalyst-auto-arm.conf | 24 ++++++++++------------ |
17 |
5 files changed, 19 insertions(+), 21 deletions(-) |
18 |
|
19 |
diff --git a/releases/specs/arm/armv7a/stage1-hardfloat.spec b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec |
20 |
similarity index 74% |
21 |
rename from releases/specs/arm/armv7a/stage1-hardfloat.spec |
22 |
rename to releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec |
23 |
index a4c888fd..d7519391 100644 |
24 |
--- a/releases/specs/arm/armv7a/stage1-hardfloat.spec |
25 |
+++ b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec |
26 |
@@ -1,10 +1,10 @@ |
27 |
subarch: armv7a_hardfp |
28 |
-version_stamp: @TIMESTAMP@ |
29 |
+version_stamp: openrc-@TIMESTAMP@ |
30 |
target: stage1 |
31 |
rel_type: default |
32 |
profile: default/linux/arm/17.0/armv7a |
33 |
snapshot: @TIMESTAMP@ |
34 |
-source_subpath: default/stage3-armv7a_hardfp-latest |
35 |
+source_subpath: default/stage3-armv7a_hardfp-openrc-latest |
36 |
compression_mode: pixz_x |
37 |
update_seed: yes |
38 |
update_seed_command: -uDN @world |
39 |
|
40 |
diff --git a/releases/specs/arm/armv7a/stage1.spec b/releases/specs/arm/armv7a/stage1-openrc.spec |
41 |
similarity index 75% |
42 |
rename from releases/specs/arm/armv7a/stage1.spec |
43 |
rename to releases/specs/arm/armv7a/stage1-openrc.spec |
44 |
index db9e62ff..9c585823 100644 |
45 |
--- a/releases/specs/arm/armv7a/stage1.spec |
46 |
+++ b/releases/specs/arm/armv7a/stage1-openrc.spec |
47 |
@@ -1,10 +1,10 @@ |
48 |
subarch: armv7a |
49 |
-version_stamp: @TIMESTAMP@ |
50 |
+version_stamp: openrc-@TIMESTAMP@ |
51 |
target: stage1 |
52 |
rel_type: default |
53 |
profile: default/linux/arm/17.0/armv7a |
54 |
snapshot: @TIMESTAMP@ |
55 |
-source_subpath: default/stage3-armv7a-latest |
56 |
+source_subpath: default/stage3-armv7a-openrc-latest |
57 |
compression_mode: pixz_x |
58 |
update_seed: yes |
59 |
update_seed_command: -uDN @world |
60 |
|
61 |
diff --git a/releases/specs/arm/armv7a/stage3-hardfloat.spec b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec |
62 |
similarity index 68% |
63 |
rename from releases/specs/arm/armv7a/stage3-hardfloat.spec |
64 |
rename to releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec |
65 |
index a418e902..95d55e85 100644 |
66 |
--- a/releases/specs/arm/armv7a/stage3-hardfloat.spec |
67 |
+++ b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec |
68 |
@@ -1,10 +1,10 @@ |
69 |
subarch: armv7a_hardfp |
70 |
-version_stamp: @TIMESTAMP@ |
71 |
+version_stamp: openrc-@TIMESTAMP@ |
72 |
target: stage3 |
73 |
rel_type: default |
74 |
profile: default/linux/arm/17.0/armv7a |
75 |
snapshot: @TIMESTAMP@ |
76 |
-source_subpath: default/stage1-armv7a_hardfp-@TIMESTAMP@ |
77 |
+source_subpath: default/stage1-armv7a_hardfp-openrc-@TIMESTAMP@ |
78 |
compression_mode: pixz_x |
79 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
80 |
portage_prefix: releng |
81 |
|
82 |
diff --git a/releases/specs/arm/armv7a/stage3.spec b/releases/specs/arm/armv7a/stage3-openrc.spec |
83 |
similarity index 69% |
84 |
rename from releases/specs/arm/armv7a/stage3.spec |
85 |
rename to releases/specs/arm/armv7a/stage3-openrc.spec |
86 |
index 037dcbd3..b4302c62 100644 |
87 |
--- a/releases/specs/arm/armv7a/stage3.spec |
88 |
+++ b/releases/specs/arm/armv7a/stage3-openrc.spec |
89 |
@@ -1,10 +1,10 @@ |
90 |
subarch: armv7a |
91 |
-version_stamp: @TIMESTAMP@ |
92 |
+version_stamp: openrc-@TIMESTAMP@ |
93 |
target: stage3 |
94 |
rel_type: default |
95 |
profile: default/linux/arm/17.0/armv7a |
96 |
snapshot: @TIMESTAMP@ |
97 |
-source_subpath: default/stage1-armv7a-@TIMESTAMP@ |
98 |
+source_subpath: default/stage1-armv7a-openrc-@TIMESTAMP@ |
99 |
compression_mode: pixz_x |
100 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
101 |
portage_prefix: releng |
102 |
|
103 |
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf |
104 |
index 9f472845..27e86522 100644 |
105 |
--- a/tools/catalyst-auto-arm.conf |
106 |
+++ b/tools/catalyst-auto-arm.conf |
107 |
@@ -11,6 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm |
108 |
EMAIL_SUBJECT_PREPEND="[arm-auto]" |
109 |
|
110 |
SETS=" |
111 |
+ armv7a_hf_openrc |
112 |
+ armv7a_hf_systemd |
113 |
+ armv7a_sf_openrc |
114 |
+ armv7a_sf_systemd |
115 |
armv4tl_openrc |
116 |
armv4tl_systemd |
117 |
armv5tel_openrc |
118 |
@@ -21,12 +25,6 @@ SETS=" |
119 |
armv6j_sf_systemd |
120 |
" |
121 |
|
122 |
-# armv7a_hf |
123 |
-# armv7a_sf |
124 |
-# armv7a_hf_systemd |
125 |
-# armv7a_sf_systemd |
126 |
- |
127 |
- |
128 |
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" |
129 |
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" |
130 |
|
131 |
@@ -39,11 +37,11 @@ SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3- |
132 |
SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec" |
133 |
SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" |
134 |
|
135 |
-SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec" |
136 |
-SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec" |
137 |
+SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec" |
138 |
SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec" |
139 |
-SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" |
140 |
|
141 |
+SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec" |
142 |
+SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" |
143 |
|
144 |
update_symlinks() { |
145 |
# Symlink the latest stages3 to build from |
146 |
@@ -76,25 +74,25 @@ post_build() { |
147 |
armv5tel/stage3-systemd.spec) |
148 |
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* |
149 |
;; |
150 |
- armv6j/stage3.spec) |
151 |
+ armv6j/stage3-openrc.spec) |
152 |
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz* |
153 |
;; |
154 |
armv6j/stage3-systemd.spec) |
155 |
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz* |
156 |
;; |
157 |
- armv6j/stage3-hardfloat.spec) |
158 |
+ armv6j/stage3-hardfloat-openrc.spec) |
159 |
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz* |
160 |
;; |
161 |
armv6j/stage3-hardfloat-systemd.spec) |
162 |
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz* |
163 |
;; |
164 |
- armv7a/stage3.spec) |
165 |
+ armv7a/stage3-openrc.spec) |
166 |
upload stage3-armv7a-${TIMESTAMP}*.xz* |
167 |
;; |
168 |
armv7a/stage3-systemd.spec) |
169 |
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz* |
170 |
;; |
171 |
- armv7a/stage3-hardfloat.spec) |
172 |
+ armv7a/stage3-hardfloat-openrc.spec) |
173 |
upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz* |
174 |
;; |
175 |
armv7a/stage3-hardfloat-systemd.spec) |