| 1 |
commit: 763aeeca3f2d501c84f66ebcf58df8ecd900d508 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 29 19:13:14 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 29 19:13:14 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=763aeeca |
| 7 |
|
| 8 |
Move armv6j from demeter to jiji |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{stage1-hardfloat.spec => stage1-hardfloat-openrc.spec} | 4 ++-- |
| 13 |
.../specs/arm/armv6j/{stage1.spec => stage1-openrc.spec} | 4 ++-- |
| 14 |
.../{stage3-hardfloat.spec => stage3-hardfloat-openrc.spec} | 4 ++-- |
| 15 |
.../specs/arm/armv6j/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
| 16 |
tools/catalyst-auto-arm.conf | 13 +++++++------ |
| 17 |
tools/catalyst-auto-qemu-arm.conf | 8 ++++---- |
| 18 |
6 files changed, 19 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/releases/specs/arm/armv6j/stage1-hardfloat.spec b/releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec |
| 21 |
similarity index 74% |
| 22 |
rename from releases/specs/arm/armv6j/stage1-hardfloat.spec |
| 23 |
rename to releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec |
| 24 |
index 6cff0f43..51666781 100644 |
| 25 |
--- a/releases/specs/arm/armv6j/stage1-hardfloat.spec |
| 26 |
+++ b/releases/specs/arm/armv6j/stage1-hardfloat-openrc.spec |
| 27 |
@@ -1,10 +1,10 @@ |
| 28 |
subarch: armv6j_hardfp |
| 29 |
-version_stamp: @TIMESTAMP@ |
| 30 |
+version_stamp: openrc-@TIMESTAMP@ |
| 31 |
target: stage1 |
| 32 |
rel_type: default |
| 33 |
profile: default/linux/arm/17.0/armv6j |
| 34 |
snapshot: @TIMESTAMP@ |
| 35 |
-source_subpath: default/stage3-armv6j_hardfp-latest |
| 36 |
+source_subpath: default/stage3-armv6j_hardfp-openrc-latest |
| 37 |
compression_mode: pixz_x |
| 38 |
update_seed: yes |
| 39 |
update_seed_command: -uDN @world |
| 40 |
|
| 41 |
diff --git a/releases/specs/arm/armv6j/stage1.spec b/releases/specs/arm/armv6j/stage1-openrc.spec |
| 42 |
similarity index 75% |
| 43 |
rename from releases/specs/arm/armv6j/stage1.spec |
| 44 |
rename to releases/specs/arm/armv6j/stage1-openrc.spec |
| 45 |
index 9ba4f0cf..f906a8a3 100644 |
| 46 |
--- a/releases/specs/arm/armv6j/stage1.spec |
| 47 |
+++ b/releases/specs/arm/armv6j/stage1-openrc.spec |
| 48 |
@@ -1,10 +1,10 @@ |
| 49 |
subarch: armv6j |
| 50 |
-version_stamp: @TIMESTAMP@ |
| 51 |
+version_stamp: openrc-@TIMESTAMP@ |
| 52 |
target: stage1 |
| 53 |
rel_type: default |
| 54 |
profile: default/linux/arm/17.0/armv6j |
| 55 |
snapshot: @TIMESTAMP@ |
| 56 |
-source_subpath: default/stage3-armv6j-latest |
| 57 |
+source_subpath: default/stage3-armv6j-openrc-latest |
| 58 |
compression_mode: pixz_x |
| 59 |
update_seed: yes |
| 60 |
update_seed_command: -uDN @world |
| 61 |
|
| 62 |
diff --git a/releases/specs/arm/armv6j/stage3-hardfloat.spec b/releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec |
| 63 |
similarity index 68% |
| 64 |
rename from releases/specs/arm/armv6j/stage3-hardfloat.spec |
| 65 |
rename to releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec |
| 66 |
index 4cd48c1c..6810e585 100644 |
| 67 |
--- a/releases/specs/arm/armv6j/stage3-hardfloat.spec |
| 68 |
+++ b/releases/specs/arm/armv6j/stage3-hardfloat-openrc.spec |
| 69 |
@@ -1,10 +1,10 @@ |
| 70 |
subarch: armv6j_hardfp |
| 71 |
-version_stamp: @TIMESTAMP@ |
| 72 |
+version_stamp: openrc-@TIMESTAMP@ |
| 73 |
target: stage3 |
| 74 |
rel_type: default |
| 75 |
profile: default/linux/arm/17.0/armv6j |
| 76 |
snapshot: @TIMESTAMP@ |
| 77 |
-source_subpath: default/stage1-armv6j_hardfp-@TIMESTAMP@ |
| 78 |
+source_subpath: default/stage1-armv6j_hardfp-openrc-@TIMESTAMP@ |
| 79 |
compression_mode: pixz_x |
| 80 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 81 |
portage_prefix: releng |
| 82 |
|
| 83 |
diff --git a/releases/specs/arm/armv6j/stage3.spec b/releases/specs/arm/armv6j/stage3-openrc.spec |
| 84 |
similarity index 69% |
| 85 |
rename from releases/specs/arm/armv6j/stage3.spec |
| 86 |
rename to releases/specs/arm/armv6j/stage3-openrc.spec |
| 87 |
index 1db2972e..78ee4a4d 100644 |
| 88 |
--- a/releases/specs/arm/armv6j/stage3.spec |
| 89 |
+++ b/releases/specs/arm/armv6j/stage3-openrc.spec |
| 90 |
@@ -1,10 +1,10 @@ |
| 91 |
subarch: armv6j |
| 92 |
-version_stamp: @TIMESTAMP@ |
| 93 |
+version_stamp: openrc-@TIMESTAMP@ |
| 94 |
target: stage3 |
| 95 |
rel_type: default |
| 96 |
profile: default/linux/arm/17.0/armv6j |
| 97 |
snapshot: @TIMESTAMP@ |
| 98 |
-source_subpath: default/stage1-armv6j-@TIMESTAMP@ |
| 99 |
+source_subpath: default/stage1-armv6j-openrc-@TIMESTAMP@ |
| 100 |
compression_mode: pixz_x |
| 101 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 102 |
portage_prefix: releng |
| 103 |
|
| 104 |
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf |
| 105 |
index b6603745..a66e8757 100644 |
| 106 |
--- a/tools/catalyst-auto-arm.conf |
| 107 |
+++ b/tools/catalyst-auto-arm.conf |
| 108 |
@@ -15,14 +15,14 @@ SETS=" |
| 109 |
armv4tl_systemd |
| 110 |
armv5tel_openrc |
| 111 |
armv5tel_systemd |
| 112 |
+ armv6j_hf_openrc |
| 113 |
+ armv6j_hf_systemd |
| 114 |
+ armv6j_sf_openrc |
| 115 |
+ armv6j_sf_systemd |
| 116 |
" |
| 117 |
|
| 118 |
-# armv6j_hf |
| 119 |
-# armv6j_sf |
| 120 |
# armv7a_hf |
| 121 |
# armv7a_sf |
| 122 |
-# armv6j_hf_systemd |
| 123 |
-# armv6j_sf_systemd |
| 124 |
# armv7a_hf_systemd |
| 125 |
# armv7a_sf_systemd |
| 126 |
|
| 127 |
@@ -33,9 +33,10 @@ SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.sp |
| 128 |
SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec" |
| 129 |
SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec" |
| 130 |
|
| 131 |
-SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec" |
| 132 |
-SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec" |
| 133 |
+SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec" |
| 134 |
SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec" |
| 135 |
+ |
| 136 |
+SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec" |
| 137 |
SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" |
| 138 |
|
| 139 |
SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec" |
| 140 |
|
| 141 |
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf |
| 142 |
index d791c1db..3b820ce3 100644 |
| 143 |
--- a/tools/catalyst-auto-qemu-arm.conf |
| 144 |
+++ b/tools/catalyst-auto-qemu-arm.conf |
| 145 |
@@ -11,12 +11,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm |
| 146 |
EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]" |
| 147 |
|
| 148 |
SETS=" |
| 149 |
- armv6j_hf |
| 150 |
- armv6j_sf |
| 151 |
armv7a_hf |
| 152 |
armv7a_sf |
| 153 |
- armv6j_hf_systemd |
| 154 |
- armv6j_sf_systemd |
| 155 |
armv7a_hf_systemd |
| 156 |
armv7a_sf_systemd |
| 157 |
" |
| 158 |
@@ -25,6 +21,10 @@ SETS=" |
| 159 |
# armv4tl_systemd |
| 160 |
# armv5tel |
| 161 |
# armv5tel_systemd |
| 162 |
+# armv6j_hf |
| 163 |
+# armv6j_sf |
| 164 |
+# armv6j_hf_systemd |
| 165 |
+# armv6j_sf_systemd |
| 166 |
|
| 167 |
SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec" |
| 168 |
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" |
Archives