[gentoo-commits] proj/releng:master commit in: tools/

[Andreas K. Hüttel]

commit:     3be1f70b59aba7e9774208cfc58144d47d149d05
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 02:26:50 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May  2 02:26:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3be1f70b

Activate musl-hardened set

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 tools/catalyst-auto-amd64-musl.conf | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/catalyst-auto-amd64-musl.conf 
b/tools/catalyst-auto-amd64-musl.conf
index 8344aa59..d08f19e3 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -12,12 +12,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64/musl
 
 SETS="
        vanilla
+       hardened
 "
-#      hardened
-#      vanilla_systemd
-#      hardened_systemd
 
 SET_vanilla_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_hardened_SPECS="stage1-hardened.spec stage2-hardened.spec 
stage3-hardened.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
 
@@ -25,7 +24,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
 
 update_symlinks() {
        # Symlink the latest stages3 to build from
-       for d in ${BUILD_SRCDIR_BASE}/builds/musl ; do
+       for d in ${BUILD_SRCDIR_BASE}/builds/{musl,musl-hardened} ; do
                pushd "${d}" >/dev/null || exit
                shopt -s extglob
                for f in $(ls stage3*${EXTENSIONS} | grep -v latest | 
give_latest_from_dates ) ; do
@@ -56,6 +55,15 @@ post_build() {
                ;;
        esac
        popd >/dev/null || exit
+
+       pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
+       UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+       case ${spec} in
+       stage3.spec)
+               upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
+               ;;
+       esac
+       popd >/dev/null || exit
 }
 
 # vim:ft=sh: