From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CF9313835A for ; Sun, 2 May 2021 02:28:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CFC9E08EF; Sun, 2 May 2021 02:28:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4248EE08EF for ; Sun, 2 May 2021 02:28:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A02E340CCE for ; Sun, 2 May 2021 02:28:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDEFD72E for ; Sun, 2 May 2021 02:28:34 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1619922410.3be1f70b59aba7e9774208cfc58144d47d149d05.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-amd64-musl.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3be1f70b59aba7e9774208cfc58144d47d149d05 X-VCS-Branch: master Date: Sun, 2 May 2021 02:28:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c805c39a-903f-4c36-b9e5-6fc6550238a0 X-Archives-Hash: 780e94ed9777a508150c92a0427c18b9 commit: 3be1f70b59aba7e9774208cfc58144d47d149d05 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun May 2 02:26:50 2021 +0000 Commit: Andreas K. Hüttel gentoo 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 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: