public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2020-10-15  0:23 Matt Turner
  0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2020-10-15  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     1e9305877077632c74139993a799368a93e1c8c1
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 23:13:40 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 00:22:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e930587

specs/ppc/ppc64le: add musl-hardened specs

Closes: https://github.com/gentoo/releng/pull/5
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 releases/specs/ppc/ppc64le/musl-hardened-stage1.spec | 14 ++++++++++++++
 releases/specs/ppc/ppc64le/musl-hardened-stage3.spec | 11 +++++++++++
 tools/catalyst-auto-ppc64le.conf                     |  6 +++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
new file mode 100644
index 00000000..a8ef7151
--- /dev/null
+++ b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
@@ -0,0 +1,14 @@
+subarch: ppc64le
+target: stage1
+version_stamp: musl-hardened-@TIMESTAMP@
+rel_type: default
+profile: default/linux/ppc64le/17.0/musl/hardened
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-ppc64le-musl-hardened-latest
+chost: powerpc64le-gentoo-linux-musl
+compression_mode: pixz_x
+update_seed: yes
+update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+portage_overlay: /var/db/repos/musl

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
new file mode 100644
index 00000000..8d5a4047
--- /dev/null
+++ b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
@@ -0,0 +1,11 @@
+subarch: ppc64le
+target: stage3
+version_stamp: musl-hardened-@TIMESTAMP@
+rel_type: default
+profile: default/linux/ppc64le/17.0/musl/hardened
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-ppc64le-musl-hardened-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+portage_overlay: /var/db/repos/musl

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index bb6e2852..91b4ce02 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -4,6 +4,7 @@
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
 SPECS="stage1.spec stage3.spec"
+OPTIONAL_SPECS="musl-hardened-stage1.spec musl-hardened-stage3.spec"
 
 #SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
 #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
@@ -44,7 +45,10 @@ post_build() {
 		upload *${TIMESTAMP}*.iso*
 		;;
 	stage3*.spec)
-		upload stage3-ppc64le-*${TIMESTAMP}*.xz*
+		upload stage3-ppc64le-${TIMESTAMP}*.xz*
+		;;
+	musl-hardened-stage3*.spec)
+		upload stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
 		;;
 	esac
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2021-07-14 10:31 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2021-07-14 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4ee10bfab3945e1614a0fa2b0d8aedecd03ae496
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 10:29:35 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 10:29:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4ee10bfa

releases/specs/ppc/ppc64le: new spec naming scheme

introduce explicit openrc in spec/tarball name.
change power9 specs to proper catalyst subarch: power9le

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...tage1.spec => stage1-musl-hardened-openrc.spec} |  4 ++--
 ...ge1-power9.spec => stage1-openrc-power9le.spec} |  8 +++----
 .../ppc64le/{stage1.spec => stage1-openrc.spec}    |  4 ++--
 .../{systemd-stage1.spec => stage1-systemd.spec}   |  0
 ...tage3.spec => stage3-musl-hardened-openrc.spec} |  4 ++--
 ...ge3-power9.spec => stage3-openrc-power9le.spec} |  6 ++---
 .../ppc64le/{stage3.spec => stage3-openrc.spec}    |  4 ++--
 .../{systemd-stage3.spec => stage3-systemd.spec}   |  0
 tools/catalyst-auto-ppc64le.conf                   | 27 ++++++++++++++--------
 9 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
similarity index 76%
rename from releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
index 9d65a83c..d1a74651 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
+++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage1
-version_stamp: musl-hardened-@TIMESTAMP@
+version_stamp: musl-hardened-openrc-@TIMESTAMP@
 rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
-source_subpath: musl-hardened/stage3-ppc64le-musl-hardened-latest
+source_subpath: musl-hardened/stage3-ppc64le-musl-hardened-openrc-latest
 chost: powerpc64le-gentoo-linux-musl
 compression_mode: pixz_x
 update_seed: yes

diff --git a/releases/specs/ppc/ppc64le/stage1-power9.spec b/releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
similarity index 63%
rename from releases/specs/ppc/ppc64le/stage1-power9.spec
rename to releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
index d09343e8..caf9c04d 100644
--- a/releases/specs/ppc/ppc64le/stage1-power9.spec
+++ b/releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
@@ -1,10 +1,10 @@
 subarch: power9le
 target: stage1
-version_stamp: power9-@TIMESTAMP@
-rel_type: power9
-profile: default/linux/ppc64le/17.0
+version_stamp: openrc-@TIMESTAMP@
+rel_type: power9le
+profile: power9le/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: power9/stage3-ppc64le-power9-latest
+source_subpath: power9le/stage3-power9le-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world --jobs 64 --load-average 128

diff --git a/releases/specs/ppc/ppc64le/stage1.spec b/releases/specs/ppc/ppc64le/stage1-openrc.spec
similarity index 77%
rename from releases/specs/ppc/ppc64le/stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-openrc.spec
index 6c04bf37..2ac862ca 100644
--- a/releases/specs/ppc/ppc64le/stage1.spec
+++ b/releases/specs/ppc/ppc64le/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ppc64le-latest
+source_subpath: default/stage3-ppc64le-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5

diff --git a/releases/specs/ppc/ppc64le/systemd-stage1.spec b/releases/specs/ppc/ppc64le/stage1-systemd.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/systemd-stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-systemd.spec

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
similarity index 67%
rename from releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
index 588fe8c3..83cb21ca 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
+++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage3
-version_stamp: musl-hardened-@TIMESTAMP@
+version_stamp: musl-hardened-openrc-@TIMESTAMP@
 rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
-source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-@TIMESTAMP@
+source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages-musl
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/stage3-power9.spec b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
similarity index 63%
rename from releases/specs/ppc/ppc64le/stage3-power9.spec
rename to releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
index ab5a27c8..37e50ddd 100644
--- a/releases/specs/ppc/ppc64le/stage3-power9.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
@@ -1,10 +1,10 @@
 subarch: power9le
 target: stage3
-version_stamp: power9-@TIMESTAMP@
-rel_type: power9
+version_stamp: openrc-@TIMESTAMP@
+rel_type: power9le
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64le-@TIMESTAMP@
+source_subpath: default/stage1-power9le-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/stage3.spec b/releases/specs/ppc/ppc64le/stage3-openrc.spec
similarity index 69%
rename from releases/specs/ppc/ppc64le/stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-openrc.spec
index 33beba6f..620b5fad 100644
--- a/releases/specs/ppc/ppc64le/stage3.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64le-@TIMESTAMP@
+source_subpath: default/stage1-ppc64le-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/systemd-stage3.spec b/releases/specs/ppc/ppc64le/stage3-systemd.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/systemd-stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-systemd.spec

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 6fbd174b..f5486765 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -5,10 +5,11 @@ UPLOAD_USER=ppc
 UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
-SPECS="stage1.spec stage3.spec"
-OPTIONAL_SPECS="systemd-stage1.spec systemd-stage3.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} musl-hardened-stage1.spec musl-hardened-stage3.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
+SPECS="stage1-openrc.spec stage3-openrc.spec"
+SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="stage1-systemd.spec stage3-systemd.spec"
+OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
+OPTIONAL_SPECS+=" musl-hardened-stage1.spec musl-hardened-stage3.spec"
 
 #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
 #SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
@@ -20,7 +21,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f t
-	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do
+	for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,musl-hardened} ; do
 		pushd "${d}" >/dev/null
 		for t in ppc64le; do
 			for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -41,14 +42,20 @@ post_build() {
 	installcd-stage2-minimal.spec)
 		upload default/*${TIMESTAMP}*.iso*
 		;;
-	stage3*.spec)
-		upload default/stage3-ppc64le-${TIMESTAMP}*.xz*
+	stage3-openrc.spec)
+		upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
 		;;
-	systemd-stage3*.spec)
+	stage3-systemd.spec)
 		upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
 		;;
-	musl-hardened-stage3*.spec)
-		upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
+	stage3-openrc-power9le.spec)
+		upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+		;;
+	stage3-systemd-power9le.spec)
+		upload power9le/stage3-power9le-systemd-${TIMESTAMP}*.xz*
+		;;
+	stage3-musl-hardened-openrc.spec)
+		upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		;;
 	*)
 		echo "Finished ${spec}"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2021-07-14 19:50 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2021-07-14 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1a7378ae85fcf2c374a9108d69af184bbf2ef99a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 19:49:50 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 19:49:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=1a7378ae

releases/specs/ppc/ppc64le: add systemd-power9le specs

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec | 12 ++++++++++++
 releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec | 10 ++++++++++
 tools/catalyst-auto-ppc64le.conf                        |  1 +
 3 files changed, 23 insertions(+)

diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec b/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec
new file mode 100644
index 00000000..404eb613
--- /dev/null
+++ b/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec
@@ -0,0 +1,12 @@
+subarch: power9le
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/ppc64le/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: power9le/stage3-power9le-systemd-latest
+compression_mode: pixz_x
+update_seed: yes
+update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 8
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec b/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec
new file mode 100644
index 00000000..9bb81bb6
--- /dev/null
+++ b/releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec
@@ -0,0 +1,10 @@
+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_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index f5486765..5a5ff353 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -9,6 +9,7 @@ SPECS="stage1-openrc.spec stage3-openrc.spec"
 SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
 OPTIONAL_SPECS="stage1-systemd.spec stage3-systemd.spec"
 OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
+OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
 OPTIONAL_SPECS+=" musl-hardened-stage1.spec musl-hardened-stage3.spec"
 
 #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2022-12-12 18:36 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2022-12-12 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b30225aff60939ff28461da185f749a923807864
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 18:35:53 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 18:35:59 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=b30225af

specs/ppc64le: rename files to -mu- for consistency

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...ystemd-mergedusr-power9le.spec => stage1-systemd-mu-power9le.spec} | 0
 ...ystemd-mergedusr-power9le.spec => stage3-systemd-mu-power9le.spec} | 0
 tools/catalyst-auto-ppc64le.conf                                      | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-mergedusr-power9le.spec b/releases/specs/ppc/ppc64le/stage1-systemd-mu-power9le.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/stage1-systemd-mergedusr-power9le.spec
rename to releases/specs/ppc/ppc64le/stage1-systemd-mu-power9le.spec

diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-mergedusr-power9le.spec b/releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/stage3-systemd-mergedusr-power9le.spec
rename to releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index b8999b35..516f969a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -11,7 +11,7 @@ OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
 OPTIONAL_SPECS+=" stage1-systemd-mu.spec stage3-systemd-mu.spec"
 OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
 OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
-OPTIONAL_SPECS+=" stage1-systemd-mergedusr-power9le.spec stage3-systemd-mergedusr-power9le.spec"
+OPTIONAL_SPECS+=" stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec"
 OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
 OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
 
@@ -62,7 +62,7 @@ post_build() {
 	stage3-systemd-power9le.spec)
 		upload power9le/stage3-power9le-systemd-${TIMESTAMP}*.xz*
 		;;
-	stage3-systemd-mergedusr-power9le.spec)
+	stage3-systemd-mu-power9le.spec)
 		upload power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
 		;;
 	stage3-musl-hardened-openrc.spec)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2022-12-12 18:49 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2022-12-12 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1281dd152f2b4a8e6069d3f938f6e57744f76090
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 18:45:35 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 18:48:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=1281dd15

specs/ppc64le: add power9 desktop systemd mu stages

no need for power8 stages, nobody uses those machines as desktop.
no support for unmerged usr systemd, as it's going away in ~6mo.

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec | 10 ++++++++++
 tools/catalyst-auto-ppc64le.conf                            |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec b/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
new file mode 100644
index 00000000..8f69d5ef
--- /dev/null
+++ b/releases/specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec
@@ -0,0 +1,10 @@
+subarch: power9le
+target: stage3
+version_stamp: desktop-systemd-mergedusr-@TIMESTAMP@
+rel_type: power9le-mergedusr
+profile: default/linux/ppc64le/17.0/desktop/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: power9le-mergedusr/stage1-power9le-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index f24460c8..99edeeb2 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -11,7 +11,7 @@ OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
 OPTIONAL_SPECS+=" stage1-systemd-mu.spec stage3-systemd-mu.spec"
 OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
 OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
-OPTIONAL_SPECS+=" stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec"
+OPTIONAL_SPECS+=" stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
 OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
 OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
 
@@ -68,6 +68,9 @@ post_build() {
 	stage3-systemd-mu-power9le.spec)
 		upload power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
 		;;
+	stage3d-systemd-mu-power9le.spec)
+		upload power9le-mergedusr/stage3-power9le-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
+		;;
 	stage3-musl-hardened-openrc.spec)
 		upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		;;


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2023-12-25 17:06 Andreas K. Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2023-12-25 17:06 UTC (permalink / raw
  To: gentoo-commits

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}"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
@ 2024-04-05 18:53 Andreas K. Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Hüttel @ 2024-04-05 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     71c15eec945ce183b2f77777224ca937b480c666
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 18:53:38 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 18:53:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=71c15eec

Switch ppc64le boot media to 23.0

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 releases/specs/ppc/ppc64le/installcd-stage1.spec   |  6 +--
 .../ppc/ppc64le/installcd-stage2-minimal.spec      | 50 +++++++++++-----------
 tools/catalyst-auto-ppc64le.conf                   |  4 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/installcd-stage1.spec b/releases/specs/ppc/ppc64le/installcd-stage1.spec
index 68960307..a744cd0d 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage1.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage1.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 version_stamp: @TIMESTAMP@
 target: livecd-stage1
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
 snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-ppc64le-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-ppc64le-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/isos
 

diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
index 133df307..adef9670 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 version_stamp: @TIMESTAMP@
 target: livecd-stage2
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
 snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-ppc64le-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-ppc64le-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
@@ -84,10 +84,10 @@ livecd/empty:
 	/etc/rsync
 	/etc/runlevels/single
 	/etc/skel
-	/lib/dev-state
-	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
+	/usr/lib/dev-state
+	/usr/lib/udev-state
+	/usr/lib64/dev-state
+	/usr/lib64/udev-state
 	/root/.ccache
 	/tmp
 	/usr/include
@@ -158,17 +158,17 @@ livecd/rm:
 	/etc/make.profile
 	/etc/man.conf
 	/etc/resolv.conf
-	/lib*/*.a
-	/lib*/*.la
-	/lib*/cpp
+	/usr/lib*/*.a
+	/usr/lib*/*.la
+	/usr/lib*/cpp
 	/root/.bash_history
 	/root/.viminfo
-	/sbin/*.static
-	/sbin/fsck.cramfs
-	/sbin/fsck.minix
-	/sbin/mkfs.bfs
-	/sbin/mkfs.cramfs
-	/sbin/mkfs.minix
+	/usr/bin/*.static
+	/usr/bin/fsck.cramfs
+	/usr/bin/fsck.minix
+	/usr/bin/mkfs.bfs
+	/usr/bin/mkfs.cramfs
+	/usr/bin/mkfs.minix
 	/usr/bin/addr2line
 	/usr/bin/ar
 	/usr/bin/as
@@ -211,15 +211,15 @@ livecd/rm:
 	/usr/lib*/*.la
 	/usr/lib*/perl5/site_perl
 	/usr/lib*/gcc-lib/*/*/libgcj*
-	/usr/sbin/archive-conf
-	/usr/sbin/dispatch-conf
-	/usr/sbin/emaint
-	/usr/sbin/env-update
-	/usr/sbin/etc-update
-	/usr/sbin/fb*
-	/usr/sbin/fixpackages
-	/usr/sbin/quickpkg
-	/usr/sbin/regenworld
+	/usr/bin/archive-conf
+	/usr/bin/dispatch-conf
+	/usr/bin/emaint
+	/usr/bin/env-update
+	/usr/bin/etc-update
+	/usr/bin/fb*
+	/usr/bin/fixpackages
+	/usr/bin/quickpkg
+	/usr/bin/regenworld
 	/usr/share/consolefonts/1*
 	/usr/share/consolefonts/7*
 	/usr/share/consolefonts/8*

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 75356aa0..aba6051a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -19,7 +19,6 @@ SETS="
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
 
@@ -29,6 +28,7 @@ SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stag
 
 
 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
 
@@ -68,7 +68,7 @@ post_build() {
 
 	case ${spec} in
 	installcd-stage2-minimal.spec)
-		upload default/*${TIMESTAMP}*.iso*
+		upload 23.0-default/*${TIMESTAMP}*.iso*
 		;;
 	stage3-openrc.spec)
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-04-05 18:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-12 18:49 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/ Georgy Yakovlev
  -- strict thread matches above, loose matches on Subject: below --
2024-04-05 18:53 Andreas K. Hüttel
2023-12-25 17:06 Andreas K. Hüttel
2022-12-12 18:36 Georgy Yakovlev
2021-07-14 19:50 Georgy Yakovlev
2021-07-14 10:31 Georgy Yakovlev
2020-10-15  0:23 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox