commit: 7502df16a30193ff4fc3e79bf3cbffe4bab6398a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 11:48:11 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 11:48:11 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7502df16
Update PPC BE build files and enable binpkg upload
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ppc/ppc32/stage1-systemd.spec | 12 ------------
.../specs/ppc/ppc32/stage3-musl-hardened-openrc.spec | 2 +-
releases/specs/ppc/ppc32/stage3-openrc.spec | 1 +
releases/specs/ppc/ppc32/stage3-systemd.spec | 10 ----------
releases/specs/ppc/ppc64/stage1-systemd.spec | 12 ------------
.../specs/ppc/ppc64/stage3-musl-hardened-openrc.spec | 2 +-
releases/specs/ppc/ppc64/stage3-openrc.spec | 1 +
releases/specs/ppc/ppc64/stage3-systemd.spec | 10 ----------
tools/catalyst-auto-ppc.conf | 16 +++++++---------
9 files changed, 11 insertions(+), 55 deletions(-)
diff --git a/releases/specs/ppc/ppc32/stage1-systemd.spec
b/releases/specs/ppc/ppc32/stage1-systemd.spec
deleted file mode 100644
index 2221dbf3..00000000
--- a/releases/specs/ppc/ppc32/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: ppc
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ppc-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec
b/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec
index 74608a69..bc25fa9e 100644
--- a/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec
+++ b/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec
@@ -8,4 +8,4 @@ source_subpath:
musl-hardened/stage1-ppc-musl-hardened-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
-repos: /var/db/repos/musl
+binrepo_path: ppc/binpackages/17.0/ppc_musl_hardened
diff --git a/releases/specs/ppc/ppc32/stage3-openrc.spec
b/releases/specs/ppc/ppc32/stage3-openrc.spec
index 2f86e430..f4c73b5a 100644
--- a/releases/specs/ppc/ppc32/stage3-openrc.spec
+++ b/releases/specs/ppc/ppc32/stage3-openrc.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-ppc-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/ppc
diff --git a/releases/specs/ppc/ppc32/stage3-systemd.spec
b/releases/specs/ppc/ppc32/stage3-systemd.spec
deleted file mode 100644
index 8a94106e..00000000
--- a/releases/specs/ppc/ppc32/stage3-systemd.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: ppc
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ppc/ppc64/stage1-systemd.spec
b/releases/specs/ppc/ppc64/stage1-systemd.spec
deleted file mode 100644
index ae151295..00000000
--- a/releases/specs/ppc/ppc64/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: ppc64
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc64/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ppc64-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec
b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec
index 1dcb905e..5cc7f089 100644
--- a/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec
+++ b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec
@@ -8,4 +8,4 @@ source_subpath:
musl-hardened/stage1-ppc64-musl-hardened-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
-repos: /var/db/repos/musl
+binrepo_path: ppc/binpackages/17.0/ppc64_musl_hardened
diff --git a/releases/specs/ppc/ppc64/stage3-openrc.spec
b/releases/specs/ppc/ppc64/stage3-openrc.spec
index 6658eb3f..a5e6f84f 100644
--- a/releases/specs/ppc/ppc64/stage3-openrc.spec
+++ b/releases/specs/ppc/ppc64/stage3-openrc.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-ppc64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/ppc64
diff --git a/releases/specs/ppc/ppc64/stage3-systemd.spec
b/releases/specs/ppc/ppc64/stage3-systemd.spec
deleted file mode 100644
index 4b811553..00000000
--- a/releases/specs/ppc/ppc64/stage3-systemd.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: ppc64
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc64/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index f354b260..2e3e8236 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,10 +11,10 @@ SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec
ppc64/stage1-openrc.spe
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
-#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd.spec
ppc64/stage3-systemd.spec"
+
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd-mu.spec
ppc64/stage3-systemd-mu.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec
ppc64/stage3-musl-hardened-openrc.spec"
-#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd.spec
ppc32/stage3-systemd.spec"
+
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd-mu.spec
ppc32/stage3-systemd-mu.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec
ppc32/stage3-musl-hardened-openrc.spec"
@@ -25,7 +25,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/musl-hardened"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in
"${BUILD_SRCDIR_BASE}/builds"/{default,musl-hardened,mergedusr} ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -51,27 +51,25 @@ post_build() {
;;
ppc32/stage3-openrc.spec)
upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
- ;;
- ppc32/stage3-systemd.spec)
- upload default/stage3-ppc-systemd-*${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
;;
ppc32/stage3-systemd-mu.spec)
upload mergedusr/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz*
;;
ppc32/stage3-musl-hardened-openrc.spec)
upload
musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc"
ppc/17.0/ppc_musl_hardened
;;
ppc64/stage3-openrc.spec)
upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
- ;;
- ppc64/stage3-systemd.spec)
- upload default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
;;
ppc64/stage3-systemd-mu.spec)
upload
mergedusr/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz*
;;
ppc64/stage3-musl-hardened-openrc.spec)
upload
musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64"
ppc/17.0/ppc64_musl_hardened
;;
*)
echo "Finished ${spec}"
