commit: 937e558b18eca81b0db57600ec4e8e777022d002
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:06:33 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:06:33 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=937e558b
Update PPC LE build files and enable binpkg upload
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec | 1 -
.../specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec | 1 -
releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec | 12 ------------
releases/specs/ppc/ppc64le/stage1-systemd.spec | 12 ------------
.../ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec | 2 +-
.../specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec | 2 +-
releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec | 1 +
releases/specs/ppc/ppc64le/stage3-openrc.spec | 1 +
releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec | 1 +
releases/specs/ppc/ppc64le/stage3-systemd-mu.spec | 1 +
releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec | 10 ----------
releases/specs/ppc/ppc64le/stage3-systemd.spec | 10 ----------
releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec | 1 +
.../specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec | 1 +
tools/catalyst-auto-ppc64le.conf | 14 ++++----------
15 files changed, 12 insertions(+), 58 deletions(-)
diff --git
a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec
b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec
index 6bfc533d..94632a30 100644
--- a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec
@@ -11,4 +11,3 @@ 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
-repos: /var/db/repos/musl
diff --git a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
index 05f60976..cc9c8c8b 100644
--- a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
+++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
@@ -11,4 +11,3 @@ 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
-repos: /var/db/repos/musl
diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec
b/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec
deleted file mode 100644
index fbd7b119..00000000
--- a/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: power9le
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: power9le
-profile: default/linux/ppc64le/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: power9le/stage3-power9le-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/ppc64le/stage1-systemd.spec
b/releases/specs/ppc/ppc64le/stage1-systemd.spec
deleted file mode 100644
index ab4c37ff..00000000
--- a/releases/specs/ppc/ppc64le/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: ppc64le
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc64le/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ppc64le-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/ppc64le/stage3-musl-hardened-openrc-power9le.spec
b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec
index e57844b7..7803fc1c 100644
--- a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec
@@ -8,4 +8,4 @@ source_subpath:
power9le-musl-hardened/stage1-power9le-musl-hardened-openrc-@TIM
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
-repos: /var/db/repos/musl
+binrepo_path: ppc/binpackages/17.0/power9le_musl_hardened
diff --git a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
index fa9577a8..4a75c3c8 100644
--- a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
+++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
@@ -8,4 +8,4 @@ source_subpath:
musl-hardened/stage1-ppc64le-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/ppc64le_musl_hardened
diff --git a/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
index 9792c085..94a7483f 100644
--- a/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
@@ -8,3 +8,4 @@ source_subpath: power9le/stage1-power9le-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/power9le
diff --git a/releases/specs/ppc/ppc64le/stage3-openrc.spec
b/releases/specs/ppc/ppc64le/stage3-openrc.spec
index 8668fbca..de7f55ce 100644
--- a/releases/specs/ppc/ppc64le/stage3-openrc.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-ppc64le-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/ppc64le
diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec
b/releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec
index af74386a..e26f0659 100644
--- a/releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec
@@ -8,3 +8,4 @@ source_subpath:
power9le-mergedusr/stage1-power9le-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/power9le
diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec
b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec
index 7fe9eeef..01132056 100644
--- a/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec
+++ b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec
@@ -8,3 +8,4 @@ source_subpath:
mergedusr/stage1-ppc64le-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/ppc64le
diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec
b/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec
deleted file mode 100644
index 46ed599c..00000000
--- a/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: power9le
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: power9le
-profile: default/linux/ppc64le/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: power9le/stage1-power9le-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ppc/ppc64le/stage3-systemd.spec
b/releases/specs/ppc/ppc64le/stage3-systemd.spec
deleted file mode 100644
index 22b0fc81..00000000
--- a/releases/specs/ppc/ppc64le/stage3-systemd.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: ppc64le
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/ppc64le/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64le-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec
b/releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec
index 94cee65e..a852ac2c 100644
--- a/releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec
@@ -8,3 +8,4 @@ source_subpath: power9le/stage1-power9le-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/power9le
diff --git a/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
b/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
index 8f69d5ef..76e51457 100644
--- a/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
+++ b/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
@@ -8,3 +8,4 @@ source_subpath:
power9le-mergedusr/stage1-power9le-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
+binrepo_path: ppc/binpackages/17.0/power9le
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index eb27429c..67061610 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -17,14 +17,10 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec
stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-SET_systemd_power9le_SPECS="stage1-systemd-power9le.spec
stage3-systemd-power9le.spec"
-
SET_systemd_power9le_mu_SPECS="stage1-systemd-mu-power9le.spec
stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec
stage3-musl-hardened-openrc.spec"
@@ -63,22 +59,18 @@ post_build() {
;;
stage3-openrc.spec)
upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
- ;;
- stage3-systemd.spec)
- upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
;;
stage3-systemd-mu.spec)
upload
mergedusr/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
stage3-openrc-power9le.spec)
upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
;;
stage3d-openrc-power9le.spec)
upload power9le/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
;;
- stage3-systemd-power9le.spec)
- upload power9le/stage3-power9le-systemd-${TIMESTAMP}*.xz*
- ;;
stage3-systemd-mu-power9le.spec)
upload
power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
@@ -87,9 +79,11 @@ post_build() {
;;
stage3-musl-hardened-openrc.spec)
upload
musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le"
ppc/17.0/ppc64le_musl_hardened
;;
stage3-musl-hardened-openrc-power9le.spec)
upload
power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le"
ppc/17.0/power9le_musl_hardened
;;
*)
echo "Finished ${spec}"
