aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-03-29 09:38:26 +0200
committerAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-03-29 09:38:26 +0200
commit335f688cb926cd99fb1172bad85073c6e4b00b25 (patch)
tree7d6a99c28f5772a8189ee91f0ecbed47fff8b64e /profiles
parentgames-engines/luxtorpeda: cleanup old version (diff)
downloadguru-335f688cb926cd99fb1172bad85073c6e4b00b25.tar.gz
guru-335f688cb926cd99fb1172bad85073c6e4b00b25.tar.bz2
guru-335f688cb926cd99fb1172bad85073c6e4b00b25.zip
profiles/*: disable per profile masking in an overlay
Currently this breaks pkgcheck/pkgdev and does not work with pkgcore. Mask systemd-swap on all profiles as a temporarily workaround Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch.list4
-rw-r--r--profiles/arches.desc4
-rw-r--r--profiles/package.mask14
-rw-r--r--profiles/profiles.desc11
4 files changed, 14 insertions, 19 deletions
diff --git a/profiles/arch.list b/profiles/arch.list
deleted file mode 100644
index 5ed7343ce..000000000
--- a/profiles/arch.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# Theo Anderson <telans@posteo.de> (2021-01-06)
-# New arch created for the purpose of hiding profiles.
-# Assuming no one sets KEYWORDS="~hidden"
-hidden
diff --git a/profiles/arches.desc b/profiles/arches.desc
deleted file mode 100644
index 99924d624..000000000
--- a/profiles/arches.desc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Theo Anderson <telans@posteo.de> (2021-01-06)
-# Masked the new hidden arch as testing to keep
-# in line with no stable packages in ::guru
-hidden testing
diff --git a/profiles/package.mask b/profiles/package.mask
new file mode 100644
index 000000000..f5e01cff4
--- /dev/null
+++ b/profiles/package.mask
@@ -0,0 +1,14 @@
+# Theo Anderson <telans@posteo.de> (2021-01-04)
+# SELinux profiles do not support systemd
+#
+# Andrew Ammerlaan <andrewammerlaan@riseup.net> (2021-03-29)
+# Per profile masking in an overlay is currently not working
+# with pkgcore/pkgdev/pkgcheck. Masking this for all profiles
+# as a workaround that both makes repoman happy and works with
+# pkgcore/pkgdev/pkgcheck.
+# Users of non-SELinux profiles can safely unmask this.
+# Sorry for the inconvenience.
+#
+# TODO: Either fix per profile masking in overlays, or move
+# this entry to the relevant package.mask files in ::gentoo
+>=sys-block/systemd-swap-4.4.0
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
deleted file mode 100644
index 313f39660..000000000
--- a/profiles/profiles.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Theo Anderson <telans@posteo.de> (2021-01-06)
-# Create profiles with the hidden arch where dependency conflicts
-# arise and masks are needed. They must match :gentoo profiles.
-# Using parent files within the profiles allows gentoo: profiles
-# to inherit any ::guru masks we choose.
-hidden default/linux/amd64/17.1/selinux dev
-hidden default/linux/amd64/17.1/hardened/selinux dev
-hidden default/linux/amd64/17.1/no-multilib/hardened/selinux dev
-hidden default/linux/amd64/17.0/x32 dev
-hidden default/linux/x86/17.0/selinux dev
-hidden default/linux/x86/17.0/hardened/selinux dev