| 1 |
commit: c603ac1a754e6f68dcb7bc601c425b33d82d78cf |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 7 18:25:19 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 7 18:25:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c603ac1a |
| 7 |
|
| 8 |
amd64: migrate the x32 stages to demeter, move musl to subdir |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{stage1-x32.spec => x32/stage1-openrc.spec} | 4 ++-- |
| 13 |
.../{stage2-x32.spec => x32/stage2-openrc.spec} | 4 ++-- |
| 14 |
.../{stage3-x32.spec => x32/stage3-openrc.spec} | 4 ++-- |
| 15 |
tools/catalyst-auto-amd64-demeter.conf | 26 ++++++++++++++++------ |
| 16 |
tools/catalyst-auto-amd64.conf | 3 --- |
| 17 |
5 files changed, 25 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/releases/specs/amd64/stage1-x32.spec b/releases/specs/amd64/x32/stage1-openrc.spec |
| 20 |
similarity index 76% |
| 21 |
rename from releases/specs/amd64/stage1-x32.spec |
| 22 |
rename to releases/specs/amd64/x32/stage1-openrc.spec |
| 23 |
index fbb31dd4..40f29cbb 100644 |
| 24 |
--- a/releases/specs/amd64/stage1-x32.spec |
| 25 |
+++ b/releases/specs/amd64/x32/stage1-openrc.spec |
| 26 |
@@ -1,10 +1,10 @@ |
| 27 |
subarch: x32 |
| 28 |
target: stage1 |
| 29 |
-version_stamp: @TIMESTAMP@ |
| 30 |
+version_stamp: openrc-@TIMESTAMP@ |
| 31 |
rel_type: default |
| 32 |
profile: default/linux/amd64/17.0/x32 |
| 33 |
snapshot: @TIMESTAMP@ |
| 34 |
-source_subpath: default/stage3-x32-latest |
| 35 |
+source_subpath: default/stage3-x32-openrc-latest |
| 36 |
compression_mode: pixz_x |
| 37 |
update_seed: yes |
| 38 |
update_seed_command: --update --deep --newuse @world |
| 39 |
|
| 40 |
diff --git a/releases/specs/amd64/stage2-x32.spec b/releases/specs/amd64/x32/stage2-openrc.spec |
| 41 |
similarity index 70% |
| 42 |
rename from releases/specs/amd64/stage2-x32.spec |
| 43 |
rename to releases/specs/amd64/x32/stage2-openrc.spec |
| 44 |
index 0751ba26..444009cc 100644 |
| 45 |
--- a/releases/specs/amd64/stage2-x32.spec |
| 46 |
+++ b/releases/specs/amd64/x32/stage2-openrc.spec |
| 47 |
@@ -1,10 +1,10 @@ |
| 48 |
subarch: x32 |
| 49 |
target: stage2 |
| 50 |
-version_stamp: @TIMESTAMP@ |
| 51 |
+version_stamp: openrc-@TIMESTAMP@ |
| 52 |
rel_type: default |
| 53 |
profile: default/linux/amd64/17.0/x32 |
| 54 |
snapshot: @TIMESTAMP@ |
| 55 |
-source_subpath: default/stage1-x32-@TIMESTAMP@ |
| 56 |
+source_subpath: default/stage1-x32-openrc-@TIMESTAMP@ |
| 57 |
compression_mode: pixz_x |
| 58 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 59 |
portage_prefix: releng |
| 60 |
|
| 61 |
diff --git a/releases/specs/amd64/stage3-x32.spec b/releases/specs/amd64/x32/stage3-openrc.spec |
| 62 |
similarity index 70% |
| 63 |
rename from releases/specs/amd64/stage3-x32.spec |
| 64 |
rename to releases/specs/amd64/x32/stage3-openrc.spec |
| 65 |
index 7b5e7215..5bc464b4 100644 |
| 66 |
--- a/releases/specs/amd64/stage3-x32.spec |
| 67 |
+++ b/releases/specs/amd64/x32/stage3-openrc.spec |
| 68 |
@@ -1,10 +1,10 @@ |
| 69 |
subarch: x32 |
| 70 |
target: stage3 |
| 71 |
-version_stamp: @TIMESTAMP@ |
| 72 |
+version_stamp: openrc-@TIMESTAMP@ |
| 73 |
rel_type: default |
| 74 |
profile: default/linux/amd64/17.0/x32 |
| 75 |
snapshot: @TIMESTAMP@ |
| 76 |
-source_subpath: default/stage2-x32-@TIMESTAMP@ |
| 77 |
+source_subpath: default/stage2-x32-openrc-@TIMESTAMP@ |
| 78 |
compression_mode: pixz_x |
| 79 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 80 |
portage_prefix: releng |
| 81 |
|
| 82 |
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf |
| 83 |
index 0ce857ec..8f462ad9 100644 |
| 84 |
--- a/tools/catalyst-auto-amd64-demeter.conf |
| 85 |
+++ b/tools/catalyst-auto-amd64-demeter.conf |
| 86 |
@@ -11,12 +11,15 @@ TYPE="auto" |
| 87 |
SPECS_DIR=${REPO_DIR}/releases/specs/amd64 |
| 88 |
|
| 89 |
SETS=" |
| 90 |
- vanilla |
| 91 |
- hardened |
| 92 |
+ musl |
| 93 |
+ musl_hardened |
| 94 |
+ x32_openrc |
| 95 |
" |
| 96 |
|
| 97 |
-SET_vanilla_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec" |
| 98 |
-SET_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec" |
| 99 |
+SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec" |
| 100 |
+SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec" |
| 101 |
+ |
| 102 |
+SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage2-openrc.spec x32/stage3-openrc.spec" |
| 103 |
|
| 104 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64 |
| 105 |
|
| 106 |
@@ -24,7 +27,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" |
| 107 |
|
| 108 |
update_symlinks() { |
| 109 |
# Symlink the latest stages3 to build from |
| 110 |
- for d in ${BUILD_SRCDIR_BASE}/builds/{musl,musl-hardened} ; do |
| 111 |
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,musl,musl-hardened} ; do |
| 112 |
pushd "${d}" >/dev/null || exit |
| 113 |
shopt -s extglob |
| 114 |
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 115 |
@@ -47,8 +50,17 @@ update_symlinks() { |
| 116 |
post_build() { |
| 117 |
local set=$1 spec=$2 |
| 118 |
|
| 119 |
+ pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit |
| 120 |
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32 |
| 121 |
+ case ${spec} in |
| 122 |
+ x32/stage3-openrc.spec) |
| 123 |
+ upload stage3-x32-openrc-${TIMESTAMP}.tar.xz* |
| 124 |
+ ;; |
| 125 |
+ esac |
| 126 |
+ popd >/dev/null || exit |
| 127 |
+ |
| 128 |
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit |
| 129 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE} |
| 130 |
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl |
| 131 |
case ${spec} in |
| 132 |
musl/stage3.spec) |
| 133 |
upload stage3-amd64-musl-${TIMESTAMP}.tar.xz* |
| 134 |
@@ -57,7 +69,7 @@ post_build() { |
| 135 |
popd >/dev/null || exit |
| 136 |
|
| 137 |
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit |
| 138 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE} |
| 139 |
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl |
| 140 |
case ${spec} in |
| 141 |
musl/stage3-hardened.spec) |
| 142 |
upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz* |
| 143 |
|
| 144 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
| 145 |
index 2f6ed30e..a6f1866c 100644 |
| 146 |
--- a/tools/catalyst-auto-amd64.conf |
| 147 |
+++ b/tools/catalyst-auto-amd64.conf |
| 148 |
@@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64 |
| 149 |
SETS=" |
| 150 |
multilib minimal_multilib |
| 151 |
nomultilib minimal_nomultilib |
| 152 |
- x32 |
| 153 |
systemd |
| 154 |
hardened_multilib minimal_hardened_multilib |
| 155 |
hardened_nomultilib minimal_hardened_nomultilib |
| 156 |
@@ -29,8 +28,6 @@ SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomul |
| 157 |
|
| 158 |
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" |
| 159 |
|
| 160 |
-SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
| 161 |
- |
| 162 |
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 163 |
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 164 |
#SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
Archives