[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/x32/, releases/specs/amd64/, ...
commit: dfb1c2a741f2ae767f97290814f80a2591afbbd9 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Apr 1 19:10:19 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Apr 1 19:10:19 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=dfb1c2a7 Cleanup amd64 -mu specs Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/amd64/clang/stage1-systemd-mu.spec | 12 releases/specs/amd64/clang/stage3-systemd-mu.spec | 11 --- releases/specs/amd64/nomultilib/stage1-systemd-mu.spec | 12 releases/specs/amd64/nomultilib/stage3-systemd-mu.spec | 11 --- releases/specs/amd64/stage1-systemd-mu.spec| 12 releases/specs/amd64/stage3-systemd-mu.spec| 11 --- releases/specs/amd64/stage3d-systemd-mu.spec | 11 --- releases/specs/amd64/x32/stage1-systemd-mu.spec| 12 releases/specs/amd64/x32/stage3-systemd-mu.spec| 11 --- 9 files changed, 103 deletions(-) diff --git a/releases/specs/amd64/clang/stage1-systemd-mu.spec b/releases/specs/amd64/clang/stage1-systemd-mu.spec deleted file mode 100644 index 18bafcaa.. --- a/releases/specs/amd64/clang/stage1-systemd-mu.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: amd64 -target: stage1 -version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@ -rel_type: llvm-mergedusr -profile: default/linux/amd64/17.1/systemd/clang/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: llvm-mergedusr/stage3-amd64-llvm-systemd-mergedusr-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/clang/stage3-systemd-mu.spec b/releases/specs/amd64/clang/stage3-systemd-mu.spec deleted file mode 100644 index 6895fbea.. --- a/releases/specs/amd64/clang/stage3-systemd-mu.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@ -rel_type: llvm-mergedusr -profile: default/linux/amd64/17.1/systemd/clang/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: llvm-mergedusr/stage1-amd64-llvm-systemd-mergedusr-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: amd64/binpackages/17.1/x86-64_llvm diff --git a/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec b/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec deleted file mode 100644 index e919a24c.. --- a/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: amd64 -target: stage1 -version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage3-amd64-nomultilib-systemd-mergedusr-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/nomultilib/stage3-systemd-mu.spec b/releases/specs/amd64/nomultilib/stage3-systemd-mu.spec deleted file mode 100644 index f71ceecd.. --- a/releases/specs/amd64/nomultilib/stage3-systemd-mu.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage1-amd64-nomultilib-systemd-mergedusr-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: amd64/binpackages/17.1/x86-64 diff --git a/releases/specs/amd64/stage1-systemd-mu.spec b/releases/specs/amd64/stage1-systemd-mu.spec deleted file mode 100644 index 161c3f26.. --- a/releases/specs/amd64/stage1-systemd-mu.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: amd64 -target: stage1 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/amd64/17.1/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage3-amd64-systemd-mergedusr-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/stage3-systemd-mu.spec b/releases/specs/amd64/stage3-systemd-mu.spec deleted file mode 100644 index b7dca51a.. --- a/releases/specs/amd64/stage3-systemd-mu.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: amd64 -target: stage3 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/amd64/17.1/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage1-amd64-systemd-
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/x32/
commit: 0fdd167b803bdd42780a3165ba3d114f0d361cb2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Dec 6 22:01:32 2022 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Dec 6 22:01:32 2022 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0fdd167b fix x32 mergedusr filenames Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/amd64/x32/stage1-systemd-mu.spec | 2 +- releases/specs/amd64/x32/stage3-systemd-mu.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/specs/amd64/x32/stage1-systemd-mu.spec b/releases/specs/amd64/x32/stage1-systemd-mu.spec index c42dfd7c..7b1a3d5b 100644 --- a/releases/specs/amd64/x32/stage1-systemd-mu.spec +++ b/releases/specs/amd64/x32/stage1-systemd-mu.spec @@ -4,7 +4,7 @@ version_stamp: systemd-mergedusr-@TIMESTAMP@ rel_type: mergedusr profile: default/linux/amd64/17.0/x32/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-x32-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-x32-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: --update --deep --newuse @world diff --git a/releases/specs/amd64/x32/stage3-systemd-mu.spec b/releases/specs/amd64/x32/stage3-systemd-mu.spec index 1a4ecced..d8448bc1 100644 --- a/releases/specs/amd64/x32/stage3-systemd-mu.spec +++ b/releases/specs/amd64/x32/stage3-systemd-mu.spec @@ -4,7 +4,7 @@ version_stamp: systemd-mergedusr-@TIMESTAMP@ rel_type: mergedusr profile: default/linux/amd64/17.0/x32/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-x32-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-x32-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/x32/, releases/specs/amd64/, tools/
commit: c603ac1a754e6f68dcb7bc601c425b33d82d78cf
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Jul 7 18:25:19 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Jul 7 18:25:19 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c603ac1a
amd64: migrate the x32 stages to demeter, move musl to subdir
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../{stage1-x32.spec => x32/stage1-openrc.spec}| 4 ++--
.../{stage2-x32.spec => x32/stage2-openrc.spec}| 4 ++--
.../{stage3-x32.spec => x32/stage3-openrc.spec}| 4 ++--
tools/catalyst-auto-amd64-demeter.conf | 26 --
tools/catalyst-auto-amd64.conf | 3 ---
5 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/releases/specs/amd64/stage1-x32.spec
b/releases/specs/amd64/x32/stage1-openrc.spec
similarity index 76%
rename from releases/specs/amd64/stage1-x32.spec
rename to releases/specs/amd64/x32/stage1-openrc.spec
index fbb31dd4..40f29cbb 100644
--- a/releases/specs/amd64/stage1-x32.spec
+++ b/releases/specs/amd64/x32/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: x32
target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.0/x32
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-x32-latest
+source_subpath: default/stage3-x32-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/amd64/stage2-x32.spec
b/releases/specs/amd64/x32/stage2-openrc.spec
similarity index 70%
rename from releases/specs/amd64/stage2-x32.spec
rename to releases/specs/amd64/x32/stage2-openrc.spec
index 0751ba26..444009cc 100644
--- a/releases/specs/amd64/stage2-x32.spec
+++ b/releases/specs/amd64/x32/stage2-openrc.spec
@@ -1,10 +1,10 @@
subarch: x32
target: stage2
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.0/x32
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-x32-@TIMESTAMP@
+source_subpath: default/stage1-x32-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/amd64/stage3-x32.spec
b/releases/specs/amd64/x32/stage3-openrc.spec
similarity index 70%
rename from releases/specs/amd64/stage3-x32.spec
rename to releases/specs/amd64/x32/stage3-openrc.spec
index 7b5e7215..5bc464b4 100644
--- a/releases/specs/amd64/stage3-x32.spec
+++ b/releases/specs/amd64/x32/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: x32
target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.0/x32
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-x32-@TIMESTAMP@
+source_subpath: default/stage2-x32-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64-demeter.conf
b/tools/catalyst-auto-amd64-demeter.conf
index 0ce857ec..8f462ad9 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -11,12 +11,15 @@ TYPE="auto"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
- vanilla
- hardened
+ musl
+ musl_hardened
+ x32_openrc
"
-SET_vanilla_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
-SET_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec
musl/stage3-hardened.spec"
+SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
+SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec
musl/stage3-hardened.spec"
+
+SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage2-openrc.spec
x32/stage3-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
@@ -24,7 +27,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{musl,musl-hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,musl,musl-hardened} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest |
give_latest_from_dates ) ; do
@@ -47,8 +50,17 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
+ pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32
+ case ${spec} in
+ x32/stage3-openrc.spec)
+ upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl
case ${spec} in
musl/stage3.spec)
upload stage
