* [gentoo-commits] repo/proj/guru:dev commit in: profiles/, metadata/
2021-03-29 7:56 [gentoo-commits] repo/proj/guru:master commit in: metadata/, profiles/ Andrew Ammerlaan
@ 2021-03-29 7:40 ` Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-03-29 7:40 UTC (permalink / raw
To: gentoo-commits
commit: 335f688cb926cd99fb1172bad85073c6e4b00b25
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Mar 29 07:38:26 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 29 07:38:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=335f688c
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 <AT> riseup.net>
metadata/layout.conf | 4 ----
profiles/arch.list | 4 ----
profiles/arches.desc | 4 ----
profiles/package.mask | 14 ++++++++++++++
profiles/profiles.desc | 11 -----------
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 928bfabc4..e2923f6c0 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -12,7 +12,3 @@ sign-manifests = false
# Let's start with new EAPIs if possible
eapis-banned = 0 1 2 3 4 5
eapis-deprecated = 6
-
-# 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
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: metadata/, profiles/
@ 2021-03-29 7:56 Andrew Ammerlaan
2021-03-29 7:40 ` [gentoo-commits] repo/proj/guru:dev commit in: profiles/, metadata/ Andrew Ammerlaan
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-03-29 7:56 UTC (permalink / raw
To: gentoo-commits
commit: 335f688cb926cd99fb1172bad85073c6e4b00b25
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Mar 29 07:38:26 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 29 07:38:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=335f688c
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 <AT> riseup.net>
metadata/layout.conf | 4 ----
profiles/arch.list | 4 ----
profiles/arches.desc | 4 ----
profiles/package.mask | 14 ++++++++++++++
profiles/profiles.desc | 11 -----------
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 928bfabc4..e2923f6c0 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -12,7 +12,3 @@ sign-manifests = false
# Let's start with new EAPIs if possible
eapis-banned = 0 1 2 3 4 5
eapis-deprecated = 6
-
-# 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
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-29 7:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-29 7:56 [gentoo-commits] repo/proj/guru:master commit in: metadata/, profiles/ Andrew Ammerlaan
2021-03-29 7:40 ` [gentoo-commits] repo/proj/guru:dev commit in: profiles/, metadata/ Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox