aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-10 19:59:03 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-10 19:59:03 +0200
commitbbf4201a94ea1957164821915e409d96ee321b19 (patch)
treeebdd00a12bab7f97ee4c343563579f61e1982865
parentamd64: drop unused files (diff)
downloadreleng-bbf4201a94ea1957164821915e409d96ee321b19.tar.gz
releng-bbf4201a94ea1957164821915e409d96ee321b19.tar.bz2
releng-bbf4201a94ea1957164821915e409d96ee321b19.zip
amd64: move musl-hardened specs into their own dir
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--releases/specs/amd64/musl-hardened/stage1.spec (renamed from releases/specs/amd64/musl/stage1-hardened.spec)0
-rw-r--r--releases/specs/amd64/musl-hardened/stage2.spec (renamed from releases/specs/amd64/musl/stage2-hardened.spec)0
-rw-r--r--releases/specs/amd64/musl-hardened/stage3.spec (renamed from releases/specs/amd64/musl/stage3-hardened.spec)0
-rw-r--r--tools/catalyst-auto-amd64-demeter.conf5
4 files changed, 3 insertions, 2 deletions
diff --git a/releases/specs/amd64/musl/stage1-hardened.spec b/releases/specs/amd64/musl-hardened/stage1.spec
index 72f098b9..72f098b9 100644
--- a/releases/specs/amd64/musl/stage1-hardened.spec
+++ b/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
index 7794be4b..7794be4b 100644
--- a/releases/specs/amd64/musl/stage2-hardened.spec
+++ b/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
index f4731c90..f4731c90 100644
--- a/releases/specs/amd64/musl/stage3-hardened.spec
+++ b/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