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 C8F00139083 for ; Fri, 15 Dec 2017 05:48:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F423E1073; Fri, 15 Dec 2017 05:48:32 +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 D4A35E1061 for ; Fri, 15 Dec 2017 05:48:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4010F33BDE1 for ; Fri, 15 Dec 2017 05:48:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B22D77449 for ; Fri, 15 Dec 2017 05:48:28 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1513315702.d9f56a2c95452e4c101935732ae7bedd92942419.robbat2@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-amd64.conf X-VCS-Directories: tools/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: d9f56a2c95452e4c101935732ae7bedd92942419 X-VCS-Branch: master Date: Fri, 15 Dec 2017 05:48:28 +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-Archives-Salt: 8e94852f-e37b-4c92-a81a-f646adde01b1 X-Archives-Hash: 5ddc0118a298166d1759b93f540e44dc commit: d9f56a2c95452e4c101935732ae7bedd92942419 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Dec 15 05:28:22 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Dec 15 05:28:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d9f56a2c tools/catalyst-auto-amd64: stage4 builds should be optional. Signed-off-by: Robin H. Johnson gentoo.org> tools/catalyst-auto-amd64.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 87e83fa1..a6082de7 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -22,20 +22,20 @@ SETS=" SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -SET_minimal_multilib_SPECS="stage4-minimal.spec" +SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec" SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" -SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec" +SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" #SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" -SET_systemd_SPECS="stage4-systemd.spec" +SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec" SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" -SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec" +SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" -SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec" +SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec" SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"