| 1 |
commit: 09d628a305fd9c6b97e6568562df254ab73bdb95 |
| 2 |
Author: Theo Anderson <telans <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Fri Jan 8 20:38:39 2021 +0000 |
| 4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
| 5 |
CommitDate: Fri Jan 8 20:38:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=09d628a3 |
| 7 |
|
| 8 |
sys-block/systemd-swap: fix package.mask (introduce feature masking) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Theo Anderson <telans <AT> posteo.de> |
| 12 |
|
| 13 |
metadata/layout.conf | 4 ++++ |
| 14 |
profiles/arch.list | 1 + |
| 15 |
profiles/arches.desc | 1 + |
| 16 |
profiles/default/linux/amd64/17.1/hardened/selinux/parent | 2 ++ |
| 17 |
.../default/linux/amd64/17.1/no-multilib/hardened/selinux/parent | 2 ++ |
| 18 |
profiles/default/linux/amd64/17.1/selinux/parent | 2 ++ |
| 19 |
profiles/default/linux/x86/17.0/hardened/selinux/parent | 2 ++ |
| 20 |
profiles/default/linux/x86/17.0/selinux/parent | 2 ++ |
| 21 |
profiles/{ => features/selinux}/package.mask | 2 +- |
| 22 |
profiles/profiles.desc | 5 +++++ |
| 23 |
10 files changed, 22 insertions(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/metadata/layout.conf b/metadata/layout.conf |
| 26 |
index 4962033a..474114e7 100644 |
| 27 |
--- a/metadata/layout.conf |
| 28 |
+++ b/metadata/layout.conf |
| 29 |
@@ -11,3 +11,7 @@ sign-manifests = false |
| 30 |
|
| 31 |
# Let's start with new EAPIs if possible |
| 32 |
eapis-banned = 0 1 2 3 4 5 |
| 33 |
+ |
| 34 |
+# Part of ability to mask features in overlays |
| 35 |
+# https://trofi.github.io/posts/201-masking-a-package-in-gentoo-overlay.html |
| 36 |
+profile-formats = portage-2 |
| 37 |
|
| 38 |
diff --git a/profiles/arch.list b/profiles/arch.list |
| 39 |
new file mode 100644 |
| 40 |
index 00000000..136c05e0 |
| 41 |
--- /dev/null |
| 42 |
+++ b/profiles/arch.list |
| 43 |
@@ -0,0 +1 @@ |
| 44 |
+hidden |
| 45 |
|
| 46 |
diff --git a/profiles/arches.desc b/profiles/arches.desc |
| 47 |
new file mode 100644 |
| 48 |
index 00000000..08285f15 |
| 49 |
--- /dev/null |
| 50 |
+++ b/profiles/arches.desc |
| 51 |
@@ -0,0 +1 @@ |
| 52 |
+hidden testing |
| 53 |
|
| 54 |
diff --git a/profiles/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent |
| 55 |
new file mode 100644 |
| 56 |
index 00000000..285d54a1 |
| 57 |
--- /dev/null |
| 58 |
+++ b/profiles/default/linux/amd64/17.1/hardened/selinux/parent |
| 59 |
@@ -0,0 +1,2 @@ |
| 60 |
+gentoo:default/linux/amd64/17.1/hardened/selinux |
| 61 |
+:features/selinux |
| 62 |
|
| 63 |
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 |
| 64 |
new file mode 100644 |
| 65 |
index 00000000..71943202 |
| 66 |
--- /dev/null |
| 67 |
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent |
| 68 |
@@ -0,0 +1,2 @@ |
| 69 |
+gentoo:default/linux/amd64/17.1/no-multilib/hardened/selinux |
| 70 |
+:features/selinux |
| 71 |
|
| 72 |
diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent |
| 73 |
new file mode 100644 |
| 74 |
index 00000000..d81c16d4 |
| 75 |
--- /dev/null |
| 76 |
+++ b/profiles/default/linux/amd64/17.1/selinux/parent |
| 77 |
@@ -0,0 +1,2 @@ |
| 78 |
+gentoo:default/linux/amd64/17.1/selinux |
| 79 |
+:features/selinux |
| 80 |
|
| 81 |
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent |
| 82 |
new file mode 100644 |
| 83 |
index 00000000..a5268223 |
| 84 |
--- /dev/null |
| 85 |
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent |
| 86 |
@@ -0,0 +1,2 @@ |
| 87 |
+gentoo:default/linux/x86/17.0/hardened/selinux |
| 88 |
+:features/selinux |
| 89 |
|
| 90 |
diff --git a/profiles/default/linux/x86/17.0/selinux/parent b/profiles/default/linux/x86/17.0/selinux/parent |
| 91 |
new file mode 100644 |
| 92 |
index 00000000..ff294ced |
| 93 |
--- /dev/null |
| 94 |
+++ b/profiles/default/linux/x86/17.0/selinux/parent |
| 95 |
@@ -0,0 +1,2 @@ |
| 96 |
+gentoo:default/linux/x86/17.0/selinux |
| 97 |
+:features/selinux |
| 98 |
|
| 99 |
diff --git a/profiles/package.mask b/profiles/features/selinux/package.mask |
| 100 |
similarity index 60% |
| 101 |
rename from profiles/package.mask |
| 102 |
rename to profiles/features/selinux/package.mask |
| 103 |
index 0fe36181..b5ea3a42 100644 |
| 104 |
--- a/profiles/package.mask |
| 105 |
+++ b/profiles/features/selinux/package.mask |
| 106 |
@@ -1,3 +1,3 @@ |
| 107 |
-# Theo Anderson <telans@××××××.de> (2020-12-06) |
| 108 |
+# Theo Anderson <telans@××××××.de> (2021-01-04) |
| 109 |
# SELinux profiles do not support systemd |
| 110 |
>=sys-block/systemd-swap-4.4.0 |
| 111 |
|
| 112 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
| 113 |
new file mode 100644 |
| 114 |
index 00000000..e1efe75e |
| 115 |
--- /dev/null |
| 116 |
+++ b/profiles/profiles.desc |
| 117 |
@@ -0,0 +1,5 @@ |
| 118 |
+hidden default/linux/amd64/17.1/selinux stable |
| 119 |
+hidden default/linux/amd64/17.1/hardened/selinux stable |
| 120 |
+hidden default/linux/amd64/17.1/no-multilib/hardened/selinux stable |
| 121 |
+hidden default/linux/x86/17.0/selinux stable |
| 122 |
+hidden default/linux/x86/17.0/hardened/selinux stable |
Archives