From 57cb206aa5d4f889e4993f03a289425575206cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 3 Oct 2023 11:38:08 +0200 Subject: [PATCH] Refactor ppc64le builds into sets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- tools/catalyst-auto-ppc64le.conf | 38 +++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index 99edeeb2..f051430a 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -5,18 +5,34 @@ UPLOAD_USER=ppc UPLOAD_KEY=/root/.ssh/id_rsa 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 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 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" +SETS=" + openrc + systemd + systemd_mu + openrc_power9le + systemd_power9le + systemd_power9le_mu + musl_hardened + musl_hardened_power9le +" + +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" + +SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec" -#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" -#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc