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 249CB139083 for ; Sun, 3 Dec 2017 21:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8278DE0EA0; Sun, 3 Dec 2017 21:20:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5EBD3E0EA0 for ; Sun, 3 Dec 2017 21:20:55 +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 AB38433BF55 for ; Sun, 3 Dec 2017 21:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40777AC4C for ; Sun, 3 Dec 2017 21:20:52 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1512336003.c65a62093029c452f9ca5c266d046caefcfc27fd.prometheanfire@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: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: c65a62093029c452f9ca5c266d046caefcfc27fd X-VCS-Branch: master Date: Sun, 3 Dec 2017 21:20:52 +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: 326217ca-3ea3-4197-9df2-90e9a9f618f7 X-Archives-Hash: e280d693355c2f35bc5ec61a33914531 commit: c65a62093029c452f9ca5c266d046caefcfc27fd Author: Matthew Thode mthode org> AuthorDate: Sun Dec 3 21:20:03 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Sun Dec 3 21:20:03 2017 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c65a6209 remove stage4 cloud stages from tools/catalyst-auto-amd64.conf tools/catalyst-auto-amd64.conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index ea0a6cea..35bc255d 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -11,21 +11,19 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} #SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" SETS=" - multilib cloud_multilib minimal_multilib - nomultilib cloud_nomultilib minimal_nomultilib + multilib minimal_multilib + nomultilib minimal_nomultilib x32 - hardened_multilib cloud_hardened_multilib minimal_hardened_multilib - hardened_nomultilib cloud_hardened_nomultilib minimal_hardened_nomultilib + hardened_multilib minimal_hardened_multilib + hardened_nomultilib minimal_hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux " # systemd SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -SET_cloud_multilib_SPECS="stage4-cloud.spec" SET_minimal_multilib_SPECS="stage4-minimal.spec" SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" -SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec" SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec" SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" @@ -35,10 +33,8 @@ SET_systemd_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_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec" SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec" SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" -SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec" SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"