| 1 |
commit: 335f688cb926cd99fb1172bad85073c6e4b00b25 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Mon Mar 29 07:38:26 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Mon Mar 29 07:38:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=335f688c |
| 7 |
|
| 8 |
profiles/*: disable per profile masking in an overlay |
| 9 |
|
| 10 |
Currently this breaks pkgcheck/pkgdev and does not |
| 11 |
work with pkgcore. |
| 12 |
|
| 13 |
Mask systemd-swap on all profiles as a temporarily |
| 14 |
workaround |
| 15 |
|
| 16 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 17 |
|
| 18 |
metadata/layout.conf | 4 ---- |
| 19 |
profiles/arch.list | 4 ---- |
| 20 |
profiles/arches.desc | 4 ---- |
| 21 |
profiles/package.mask | 14 ++++++++++++++ |
| 22 |
profiles/profiles.desc | 11 ----------- |
| 23 |
5 files changed, 14 insertions(+), 23 deletions(-) |
| 24 |
|
| 25 |
diff --git a/metadata/layout.conf b/metadata/layout.conf |
| 26 |
index 928bfabc4..e2923f6c0 100644 |
| 27 |
--- a/metadata/layout.conf |
| 28 |
+++ b/metadata/layout.conf |
| 29 |
@@ -12,7 +12,3 @@ sign-manifests = false |
| 30 |
# Let's start with new EAPIs if possible |
| 31 |
eapis-banned = 0 1 2 3 4 5 |
| 32 |
eapis-deprecated = 6 |
| 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 |
deleted file mode 100644 |
| 40 |
index 5ed7343ce..000000000 |
| 41 |
--- a/profiles/arch.list |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,4 +0,0 @@ |
| 44 |
-# Theo Anderson <telans@××××××.de> (2021-01-06) |
| 45 |
-# New arch created for the purpose of hiding profiles. |
| 46 |
-# Assuming no one sets KEYWORDS="~hidden" |
| 47 |
-hidden |
| 48 |
|
| 49 |
diff --git a/profiles/arches.desc b/profiles/arches.desc |
| 50 |
deleted file mode 100644 |
| 51 |
index 99924d624..000000000 |
| 52 |
--- a/profiles/arches.desc |
| 53 |
+++ /dev/null |
| 54 |
@@ -1,4 +0,0 @@ |
| 55 |
-# Theo Anderson <telans@××××××.de> (2021-01-06) |
| 56 |
-# Masked the new hidden arch as testing to keep |
| 57 |
-# in line with no stable packages in ::guru |
| 58 |
-hidden testing |
| 59 |
|
| 60 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 61 |
new file mode 100644 |
| 62 |
index 000000000..f5e01cff4 |
| 63 |
--- /dev/null |
| 64 |
+++ b/profiles/package.mask |
| 65 |
@@ -0,0 +1,14 @@ |
| 66 |
+# Theo Anderson <telans@××××××.de> (2021-01-04) |
| 67 |
+# SELinux profiles do not support systemd |
| 68 |
+# |
| 69 |
+# Andrew Ammerlaan <andrewammerlaan@××××××.net> (2021-03-29) |
| 70 |
+# Per profile masking in an overlay is currently not working |
| 71 |
+# with pkgcore/pkgdev/pkgcheck. Masking this for all profiles |
| 72 |
+# as a workaround that both makes repoman happy and works with |
| 73 |
+# pkgcore/pkgdev/pkgcheck. |
| 74 |
+# Users of non-SELinux profiles can safely unmask this. |
| 75 |
+# Sorry for the inconvenience. |
| 76 |
+# |
| 77 |
+# TODO: Either fix per profile masking in overlays, or move |
| 78 |
+# this entry to the relevant package.mask files in ::gentoo |
| 79 |
+>=sys-block/systemd-swap-4.4.0 |
| 80 |
|
| 81 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
| 82 |
deleted file mode 100644 |
| 83 |
index 313f39660..000000000 |
| 84 |
--- a/profiles/profiles.desc |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,11 +0,0 @@ |
| 87 |
-# Theo Anderson <telans@××××××.de> (2021-01-06) |
| 88 |
-# Create profiles with the hidden arch where dependency conflicts |
| 89 |
-# arise and masks are needed. They must match :gentoo profiles. |
| 90 |
-# Using parent files within the profiles allows gentoo: profiles |
| 91 |
-# to inherit any ::guru masks we choose. |
| 92 |
-hidden default/linux/amd64/17.1/selinux dev |
| 93 |
-hidden default/linux/amd64/17.1/hardened/selinux dev |
| 94 |
-hidden default/linux/amd64/17.1/no-multilib/hardened/selinux dev |
| 95 |
-hidden default/linux/amd64/17.0/x32 dev |
| 96 |
-hidden default/linux/x86/17.0/selinux dev |
| 97 |
-hidden default/linux/x86/17.0/hardened/selinux dev |
Archives