From eb88620890a6d83e9225e196d86f8babde758644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sun, 12 Nov 2023 00:45:27 +0100 Subject: [PATCH] Stop building systemd split-usr stages for riscv, s390, sparc, x86 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-qemu-riscv.conf | 8 +++----- tools/catalyst-auto-s390.conf | 2 +- tools/catalyst-auto-s390x.conf | 2 +- tools/catalyst-auto-sparc64.conf | 2 +- tools/catalyst-auto-x86.conf | 2 -- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index ead9a565..12077126 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -11,16 +11,14 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]" SETS=" - lp64d_systemd_mu lp64d_openrc - lp64d_systemd + lp64d_systemd_mu lp64d_musl - lp64_systemd_mu lp64_openrc - lp64_systemd + lp64_systemd_mu lp64_musl multilib_openrc - multilib_systemd + multilib_systemd_mu " SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec" diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 51a11e1e..1e46ab4a 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390 SUBARCH=s390 -SETS="openrc systemd systemd_mu" +SETS="openrc systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 28432f1b..baf4ca90 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x SUBARCH=s390x -SETS="openrc systemd systemd_mu" +SETS="openrc systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 89d5bc91..878236f7 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -5,7 +5,7 @@ UPLOAD_USER=sparc UPLOAD_KEY=/root/.ssh/id_ed25519 SPECS_DIR=${REPO_DIR}/releases/specs/sparc -SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec" +SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec" OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index a34f8219..38b49922 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -11,10 +11,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/x86 SETS=" i486_openrc - i486_systemd i486_systemd_mu i686_openrc - i686_systemd i686_systemd_mu hardened_openrc musl