| 1 |
commit: 209b0d562a7434ebcd21975c7b3b57e151719ed2 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 17 06:28:33 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 17 06:28:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=209b0d56 |
| 7 |
|
| 8 |
releases/specs/ppc: rename BE ppc/64 specs to -openrc |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs/ppc/ppc32/installcd-stage1.spec | 2 +- |
| 13 |
.../specs/ppc/ppc32/{stage1.spec => stage1-openrc.spec} | 6 +++--- |
| 14 |
.../specs/ppc/ppc32/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
| 15 |
...ened-stage1.spec => stage1-musl-hardened-openrc.spec} | 6 +++--- |
| 16 |
.../specs/ppc/ppc64/{stage1.spec => stage1-openrc.spec} | 6 +++--- |
| 17 |
...ened-stage3.spec => stage3-musl-hardened-openrc.spec} | 4 ++-- |
| 18 |
.../specs/ppc/ppc64/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
| 19 |
tools/catalyst-auto-ppc.conf | 16 ++++++++-------- |
| 20 |
8 files changed, 24 insertions(+), 24 deletions(-) |
| 21 |
|
| 22 |
diff --git a/releases/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec |
| 23 |
index d2d456f6..48dfad46 100644 |
| 24 |
--- a/releases/specs/ppc/ppc32/installcd-stage1.spec |
| 25 |
+++ b/releases/specs/ppc/ppc32/installcd-stage1.spec |
| 26 |
@@ -4,7 +4,7 @@ version_stamp: @TIMESTAMP@ |
| 27 |
rel_type: default |
| 28 |
profile: default/linux/powerpc/ppc32/17.0 |
| 29 |
snapshot: @TIMESTAMP@ |
| 30 |
-source_subpath: default/stage3-ppc-@TIMESTAMP@ |
| 31 |
+source_subpath: default/stage3-ppc-openrc-@TIMESTAMP@ |
| 32 |
compression_mode: pixz_x |
| 33 |
portage_confdir: @REPO_DIR@/releases/portage/isos |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/releases/specs/ppc/ppc32/stage1.spec b/releases/specs/ppc/ppc32/stage1-openrc.spec |
| 37 |
similarity index 58% |
| 38 |
rename from releases/specs/ppc/ppc32/stage1.spec |
| 39 |
rename to releases/specs/ppc/ppc32/stage1-openrc.spec |
| 40 |
index 227dea18..0a0bf2c8 100644 |
| 41 |
--- a/releases/specs/ppc/ppc32/stage1.spec |
| 42 |
+++ b/releases/specs/ppc/ppc32/stage1-openrc.spec |
| 43 |
@@ -1,12 +1,12 @@ |
| 44 |
subarch: ppc |
| 45 |
target: stage1 |
| 46 |
-version_stamp: @TIMESTAMP@ |
| 47 |
+version_stamp: openrc-@TIMESTAMP@ |
| 48 |
rel_type: default |
| 49 |
profile: default/linux/powerpc/ppc32/17.0 |
| 50 |
snapshot: @TIMESTAMP@ |
| 51 |
-source_subpath: default/stage3-ppc-latest |
| 52 |
+source_subpath: default/stage3-ppc-openrc-latest |
| 53 |
compression_mode: pixz_x |
| 54 |
update_seed: yes |
| 55 |
-update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5 |
| 56 |
+update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 |
| 57 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 58 |
portage_prefix: releng |
| 59 |
|
| 60 |
diff --git a/releases/specs/ppc/ppc32/stage3.spec b/releases/specs/ppc/ppc32/stage3-openrc.spec |
| 61 |
similarity index 70% |
| 62 |
rename from releases/specs/ppc/ppc32/stage3.spec |
| 63 |
rename to releases/specs/ppc/ppc32/stage3-openrc.spec |
| 64 |
index 5578ccbd..7acd7cb1 100644 |
| 65 |
--- a/releases/specs/ppc/ppc32/stage3.spec |
| 66 |
+++ b/releases/specs/ppc/ppc32/stage3-openrc.spec |
| 67 |
@@ -1,10 +1,10 @@ |
| 68 |
subarch: ppc |
| 69 |
target: stage3 |
| 70 |
-version_stamp: @TIMESTAMP@ |
| 71 |
+version_stamp: openrc-@TIMESTAMP@ |
| 72 |
rel_type: default |
| 73 |
profile: default/linux/powerpc/ppc32/17.0 |
| 74 |
snapshot: @TIMESTAMP@ |
| 75 |
-source_subpath: default/stage1-ppc-@TIMESTAMP@ |
| 76 |
+source_subpath: default/stage1-ppc-openrc-@TIMESTAMP@ |
| 77 |
compression_mode: pixz_x |
| 78 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 79 |
portage_prefix: releng |
| 80 |
|
| 81 |
diff --git a/releases/specs/ppc/ppc64/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec |
| 82 |
similarity index 60% |
| 83 |
rename from releases/specs/ppc/ppc64/musl-hardened-stage1.spec |
| 84 |
rename to releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec |
| 85 |
index f632f32e..f6ef29d7 100644 |
| 86 |
--- a/releases/specs/ppc/ppc64/musl-hardened-stage1.spec |
| 87 |
+++ b/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec |
| 88 |
@@ -1,14 +1,14 @@ |
| 89 |
subarch: ppc64 |
| 90 |
target: stage1 |
| 91 |
-version_stamp: musl-hardened-@TIMESTAMP@ |
| 92 |
+version_stamp: musl-hardened-openrc-@TIMESTAMP@ |
| 93 |
rel_type: musl-hardened |
| 94 |
profile: default/linux/ppc64/17.0/musl/hardened |
| 95 |
snapshot: @TIMESTAMP@ |
| 96 |
-source_subpath: musl-hardened/stage3-ppc64-musl-hardened-latest |
| 97 |
+source_subpath: musl-hardened/stage3-ppc64-musl-hardened-openrc-latest |
| 98 |
chost: powerpc64-gentoo-linux-musl |
| 99 |
compression_mode: pixz_x |
| 100 |
update_seed: yes |
| 101 |
-update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5 |
| 102 |
+update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 |
| 103 |
portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
| 104 |
portage_prefix: releng |
| 105 |
repos: /var/db/repos/musl |
| 106 |
|
| 107 |
diff --git a/releases/specs/ppc/ppc64/stage1.spec b/releases/specs/ppc/ppc64/stage1-openrc.spec |
| 108 |
similarity index 59% |
| 109 |
rename from releases/specs/ppc/ppc64/stage1.spec |
| 110 |
rename to releases/specs/ppc/ppc64/stage1-openrc.spec |
| 111 |
index d2c929dd..8a99c59c 100644 |
| 112 |
--- a/releases/specs/ppc/ppc64/stage1.spec |
| 113 |
+++ b/releases/specs/ppc/ppc64/stage1-openrc.spec |
| 114 |
@@ -1,12 +1,12 @@ |
| 115 |
subarch: ppc64 |
| 116 |
target: stage1 |
| 117 |
-version_stamp: @TIMESTAMP@ |
| 118 |
+version_stamp: openrc-@TIMESTAMP@ |
| 119 |
rel_type: default |
| 120 |
profile: default/linux/powerpc/ppc64/17.0/64bit-userland |
| 121 |
snapshot: @TIMESTAMP@ |
| 122 |
-source_subpath: default/stage3-ppc64-latest |
| 123 |
+source_subpath: default/stage3-ppc64-openrc-latest |
| 124 |
compression_mode: pixz_x |
| 125 |
update_seed: yes |
| 126 |
-update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5 |
| 127 |
+update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 |
| 128 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 129 |
portage_prefix: releng |
| 130 |
|
| 131 |
diff --git a/releases/specs/ppc/ppc64/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec |
| 132 |
similarity index 67% |
| 133 |
rename from releases/specs/ppc/ppc64/musl-hardened-stage3.spec |
| 134 |
rename to releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec |
| 135 |
index 1a9a8d45..173c57f5 100644 |
| 136 |
--- a/releases/specs/ppc/ppc64/musl-hardened-stage3.spec |
| 137 |
+++ b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec |
| 138 |
@@ -1,10 +1,10 @@ |
| 139 |
subarch: ppc64 |
| 140 |
target: stage3 |
| 141 |
-version_stamp: musl-hardened-@TIMESTAMP@ |
| 142 |
+version_stamp: musl-hardened-openrc-@TIMESTAMP@ |
| 143 |
rel_type: musl-hardened |
| 144 |
profile: default/linux/ppc64/17.0/musl/hardened |
| 145 |
snapshot: @TIMESTAMP@ |
| 146 |
-source_subpath: musl-hardened/stage1-ppc64-musl-hardened-@TIMESTAMP@ |
| 147 |
+source_subpath: musl-hardened/stage1-ppc64-musl-hardened-openrc-@TIMESTAMP@ |
| 148 |
compression_mode: pixz_x |
| 149 |
portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
| 150 |
portage_prefix: releng |
| 151 |
|
| 152 |
diff --git a/releases/specs/ppc/ppc64/stage3.spec b/releases/specs/ppc/ppc64/stage3-openrc.spec |
| 153 |
similarity index 71% |
| 154 |
rename from releases/specs/ppc/ppc64/stage3.spec |
| 155 |
rename to releases/specs/ppc/ppc64/stage3-openrc.spec |
| 156 |
index a61bf719..dd30743a 100644 |
| 157 |
--- a/releases/specs/ppc/ppc64/stage3.spec |
| 158 |
+++ b/releases/specs/ppc/ppc64/stage3-openrc.spec |
| 159 |
@@ -1,10 +1,10 @@ |
| 160 |
subarch: ppc64 |
| 161 |
target: stage3 |
| 162 |
-version_stamp: @TIMESTAMP@ |
| 163 |
+version_stamp: openrc-@TIMESTAMP@ |
| 164 |
rel_type: default |
| 165 |
profile: default/linux/powerpc/ppc64/17.0/64bit-userland |
| 166 |
snapshot: @TIMESTAMP@ |
| 167 |
-source_subpath: default/stage1-ppc64-@TIMESTAMP@ |
| 168 |
+source_subpath: default/stage1-ppc64-openrc-@TIMESTAMP@ |
| 169 |
compression_mode: pixz_x |
| 170 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 171 |
portage_prefix: releng |
| 172 |
|
| 173 |
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf |
| 174 |
index 9717ee93..77e9323e 100644 |
| 175 |
--- a/tools/catalyst-auto-ppc.conf |
| 176 |
+++ b/tools/catalyst-auto-ppc.conf |
| 177 |
@@ -5,13 +5,13 @@ UPLOAD_USER=ppc |
| 178 |
UPLOAD_KEY=/root/.ssh/id_rsa |
| 179 |
SPECS_DIR=${REPO_DIR}/releases/specs/ppc |
| 180 |
|
| 181 |
-SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec" |
| 182 |
+SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec" |
| 183 |
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 184 |
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 185 |
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 186 |
|
| 187 |
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" |
| 188 |
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/musl-hardened-stage1.spec ppc64/musl-hardened-stage3.spec" |
| 189 |
+OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec" |
| 190 |
|
| 191 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc |
| 192 |
|
| 193 |
@@ -43,14 +43,14 @@ post_build() { |
| 194 |
ppc32/installcd-stage2-minimal.spec) |
| 195 |
upload default/*${TIMESTAMP}*.iso* |
| 196 |
;; |
| 197 |
- ppc32/stage3.spec) |
| 198 |
- upload default/stage3-ppc-*${TIMESTAMP}*.xz* |
| 199 |
+ ppc32/stage3-openrc.spec) |
| 200 |
+ upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz* |
| 201 |
;; |
| 202 |
- ppc64/stage3.spec) |
| 203 |
- upload default/stage3-ppc64-*${TIMESTAMP}*.xz* |
| 204 |
+ ppc64/stage3-openrc.spec) |
| 205 |
+ upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz* |
| 206 |
;; |
| 207 |
- ppc64/musl-hardened-stage3*.spec) |
| 208 |
- upload musl-hardened/stage3-ppc64-musl-hardened-${TIMESTAMP}*.xz* |
| 209 |
+ ppc64/stage3-musl-hardened-openrc.spec) |
| 210 |
+ upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz* |
| 211 |
;; |
| 212 |
*) |
| 213 |
echo "Finished ${spec}" |
Archives