From 96ddfd3126511f34279732c1d96883f70c51d83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 19 Nov 2022 14:37:12 +0100 Subject: [PATCH] Add ppc* systemd merged-usr build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/ppc/ppc32/stage1-systemd-mu.spec | 12 ++++++++++++ releases/specs/ppc/ppc32/stage3-systemd-mu.spec | 10 ++++++++++ releases/specs/ppc/ppc64/stage1-systemd-mu.spec | 12 ++++++++++++ releases/specs/ppc/ppc64/stage3-systemd-mu.spec | 10 ++++++++++ releases/specs/ppc/ppc64le/stage1-systemd-mu.spec | 12 ++++++++++++ releases/specs/ppc/ppc64le/stage3-systemd-mu.spec | 10 ++++++++++ tools/catalyst-auto-ppc.conf | 8 ++++++++ tools/catalyst-auto-ppc64le.conf | 4 ++++ 8 files changed, 78 insertions(+) create mode 100644 releases/specs/ppc/ppc32/stage1-systemd-mu.spec create mode 100644 releases/specs/ppc/ppc32/stage3-systemd-mu.spec create mode 100644 releases/specs/ppc/ppc64/stage1-systemd-mu.spec create mode 100644 releases/specs/ppc/ppc64/stage3-systemd-mu.spec create mode 100644 releases/specs/ppc/ppc64le/stage1-systemd-mu.spec create mode 100644 releases/specs/ppc/ppc64le/stage3-systemd-mu.spec diff --git a/releases/specs/ppc/ppc32/stage1-systemd-mu.spec b/releases/specs/ppc/ppc32/stage1-systemd-mu.spec new file mode 100644 index 00000000..79c9a23a --- /dev/null +++ b/releases/specs/ppc/ppc32/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: ppc +target: stage1 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-ppc-systemd-mergedusr-latest +compression_mode: pixz +update_seed: no +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-systemd-mu.spec b/releases/specs/ppc/ppc32/stage3-systemd-mu.spec new file mode 100644 index 00000000..7435b726 --- /dev/null +++ b/releases/specs/ppc/ppc32/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: ppc +target: stage3 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-ppc-systemd-mergedusr-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/ppc/ppc64/stage1-systemd-mu.spec b/releases/specs/ppc/ppc64/stage1-systemd-mu.spec new file mode 100644 index 00000000..e84e07d9 --- /dev/null +++ b/releases/specs/ppc/ppc64/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: ppc64 +target: stage1 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc64/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-ppc64-systemd-mergedusr-latest +compression_mode: pixz +update_seed: no +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-systemd-mu.spec b/releases/specs/ppc/ppc64/stage3-systemd-mu.spec new file mode 100644 index 00000000..fb62dd12 --- /dev/null +++ b/releases/specs/ppc/ppc64/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: ppc64 +target: stage3 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc64/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-ppc64-systemd-mergedusr-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec b/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec new file mode 100644 index 00000000..7d5042c3 --- /dev/null +++ b/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: ppc64le +target: stage1 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc64le/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-ppc64le-systemd-mergedusr-latest +compression_mode: pixz +update_seed: no +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-systemd-mu.spec b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec new file mode 100644 index 00000000..9b531048 --- /dev/null +++ b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: ppc64le +target: stage3 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/ppc64le/17.0/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-ppc64le-systemd-mergedusr-@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 a4ce6e78..46814162 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -12,8 +12,10 @@ SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spe 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" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc @@ -52,6 +54,9 @@ post_build() { ppc32/stage3-systemd.spec) upload default/stage3-ppc-systemd-*${TIMESTAMP}*.xz* ;; + ppc32/stage3-systemd-mu.spec) + upload default/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz* + ;; ppc32/stage3-musl-hardened-openrc.spec) upload musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz* ;; @@ -61,6 +66,9 @@ post_build() { ppc64/stage3-systemd.spec) upload default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz* ;; + ppc64/stage3-systemd-mu.spec) + upload default/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz* + ;; ppc64/stage3-musl-hardened-openrc.spec) upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz* ;; diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index f0876431..56e26f92 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -8,6 +8,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le SPECS="stage1-openrc.spec stage3-openrc.spec" OPTIONAL_SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec" 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" @@ -51,6 +52,9 @@ post_build() { stage3-systemd.spec) upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz* ;; + stage3-systemd-mu.spec) + upload default/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; stage3-openrc-power9le.spec) upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz* ;;