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 A4FAD1382C5 for ; Fri, 8 Jan 2021 20:46:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B976AE0874; Fri, 8 Jan 2021 20:46:45 +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 599B0E086D for ; Fri, 8 Jan 2021 20:46:44 +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 0989D33BDCC for ; Fri, 8 Jan 2021 20:46:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F9DC4C for ; Fri, 8 Jan 2021 20:46:41 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1610138319.09d628a305fd9c6b97e6568562df254ab73bdb95.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: profiles/, profiles/features/selinux/, ... X-VCS-Repository: repo/proj/guru X-VCS-Files: metadata/layout.conf profiles/arch.list profiles/arches.desc profiles/default/linux/amd64/17.1/hardened/selinux/parent profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent profiles/default/linux/amd64/17.1/selinux/parent profiles/default/linux/x86/17.0/hardened/selinux/parent profiles/default/linux/x86/17.0/selinux/parent profiles/features/selinux/package.mask profiles/package.mask profiles/profiles.desc X-VCS-Directories: profiles/default/linux/x86/17.0/selinux/ profiles/default/linux/amd64/17.1/selinux/ profiles/default/linux/x86/17.0/hardened/selinux/ profiles/default/linux/amd64/17.1/hardened/selinux/ metadata/ profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/ profiles/ profiles/features/selinux/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 09d628a305fd9c6b97e6568562df254ab73bdb95 X-VCS-Branch: dev Date: Fri, 8 Jan 2021 20:46:41 +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: 17690189-1146-4dac-85d7-544e8ac101a9 X-Archives-Hash: ce874bcb8626fd32f6e90cd4da0260c3 commit: 09d628a305fd9c6b97e6568562df254ab73bdb95 Author: Theo Anderson posteo de> AuthorDate: Fri Jan 8 20:38:39 2021 +0000 Commit: Theo Anderson posteo de> CommitDate: Fri Jan 8 20:38:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=09d628a3 sys-block/systemd-swap: fix package.mask (introduce feature masking) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson posteo.de> metadata/layout.conf | 4 ++++ profiles/arch.list | 1 + profiles/arches.desc | 1 + profiles/default/linux/amd64/17.1/hardened/selinux/parent | 2 ++ .../default/linux/amd64/17.1/no-multilib/hardened/selinux/parent | 2 ++ profiles/default/linux/amd64/17.1/selinux/parent | 2 ++ profiles/default/linux/x86/17.0/hardened/selinux/parent | 2 ++ profiles/default/linux/x86/17.0/selinux/parent | 2 ++ profiles/{ => features/selinux}/package.mask | 2 +- profiles/profiles.desc | 5 +++++ 10 files changed, 22 insertions(+), 1 deletion(-) diff --git a/metadata/layout.conf b/metadata/layout.conf index 4962033a..474114e7 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -11,3 +11,7 @@ sign-manifests = false # Let's start with new EAPIs if possible eapis-banned = 0 1 2 3 4 5 + +# Part of ability to mask features in overlays +# https://trofi.github.io/posts/201-masking-a-package-in-gentoo-overlay.html +profile-formats = portage-2 diff --git a/profiles/arch.list b/profiles/arch.list new file mode 100644 index 00000000..136c05e0 --- /dev/null +++ b/profiles/arch.list @@ -0,0 +1 @@ +hidden diff --git a/profiles/arches.desc b/profiles/arches.desc new file mode 100644 index 00000000..08285f15 --- /dev/null +++ b/profiles/arches.desc @@ -0,0 +1 @@ +hidden testing diff --git a/profiles/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent new file mode 100644 index 00000000..285d54a1 --- /dev/null +++ b/profiles/default/linux/amd64/17.1/hardened/selinux/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/17.1/hardened/selinux +:features/selinux diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent new file mode 100644 index 00000000..71943202 --- /dev/null +++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/17.1/no-multilib/hardened/selinux +:features/selinux diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent new file mode 100644 index 00000000..d81c16d4 --- /dev/null +++ b/profiles/default/linux/amd64/17.1/selinux/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/17.1/selinux +:features/selinux diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent new file mode 100644 index 00000000..a5268223 --- /dev/null +++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/x86/17.0/hardened/selinux +:features/selinux diff --git a/profiles/default/linux/x86/17.0/selinux/parent b/profiles/default/linux/x86/17.0/selinux/parent new file mode 100644 index 00000000..ff294ced --- /dev/null +++ b/profiles/default/linux/x86/17.0/selinux/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/x86/17.0/selinux +:features/selinux diff --git a/profiles/package.mask b/profiles/features/selinux/package.mask similarity index 60% rename from profiles/package.mask rename to profiles/features/selinux/package.mask index 0fe36181..b5ea3a42 100644 --- a/profiles/package.mask +++ b/profiles/features/selinux/package.mask @@ -1,3 +1,3 @@ -# Theo Anderson (2020-12-06) +# Theo Anderson (2021-01-04) # SELinux profiles do not support systemd >=sys-block/systemd-swap-4.4.0 diff --git a/profiles/profiles.desc b/profiles/profiles.desc new file mode 100644 index 00000000..e1efe75e --- /dev/null +++ b/profiles/profiles.desc @@ -0,0 +1,5 @@ +hidden default/linux/amd64/17.1/selinux stable +hidden default/linux/amd64/17.1/hardened/selinux stable +hidden default/linux/amd64/17.1/no-multilib/hardened/selinux stable +hidden default/linux/x86/17.0/selinux stable +hidden default/linux/x86/17.0/hardened/selinux stable