From bbf4201a94ea1957164821915e409d96ee321b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 10 Jul 2021 19:59:03 +0200 Subject: [PATCH] amd64: move musl-hardened specs into their own dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- .../{musl/stage1-hardened.spec => musl-hardened/stage1.spec} | 0 .../{musl/stage2-hardened.spec => musl-hardened/stage2.spec} | 0 .../{musl/stage3-hardened.spec => musl-hardened/stage3.spec} | 0 tools/catalyst-auto-amd64-demeter.conf | 5 +++-- 4 files changed, 3 insertions(+), 2 deletions(-) rename releases/specs/amd64/{musl/stage1-hardened.spec => musl-hardened/stage1.spec} (100%) rename releases/specs/amd64/{musl/stage2-hardened.spec => musl-hardened/stage2.spec} (100%) rename releases/specs/amd64/{musl/stage3-hardened.spec => musl-hardened/stage3.spec} (100%) diff --git a/releases/specs/amd64/musl/stage1-hardened.spec b/releases/specs/amd64/musl-hardened/stage1.spec similarity index 100% rename from releases/specs/amd64/musl/stage1-hardened.spec rename to releases/specs/amd64/musl-hardened/stage1.spec diff --git a/releases/specs/amd64/musl/stage2-hardened.spec b/releases/specs/amd64/musl-hardened/stage2.spec similarity index 100% rename from releases/specs/amd64/musl/stage2-hardened.spec rename to releases/specs/amd64/musl-hardened/stage2.spec diff --git a/releases/specs/amd64/musl/stage3-hardened.spec b/releases/specs/amd64/musl-hardened/stage3.spec similarity index 100% rename from releases/specs/amd64/musl/stage3-hardened.spec rename to releases/specs/amd64/musl-hardened/stage3.spec diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf index ecea6d73..42755ae3 100644 --- a/tools/catalyst-auto-amd64-demeter.conf +++ b/tools/catalyst-auto-amd64-demeter.conf @@ -43,7 +43,8 @@ SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-ope SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.spec" SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec" -SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec" + +SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage2.spec musl-hardened/stage3.spec" SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage2-openrc.spec x32/stage3-openrc.spec" @@ -128,7 +129,7 @@ post_build() { pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit case ${spec} in - musl/stage3-hardened.spec) + musl-hardened/stage3.spec) upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz* ;; esac