* [gentoo-commits] repo/proj/guru:master commit in: profiles/default/linux/amd64/17.0/x32/, ...
@ 2021-01-10 11:31 Andrew Ammerlaan
0 siblings, 0 replies; only message in thread
From: Andrew Ammerlaan @ 2021-01-10 11:31 UTC (permalink / raw
To: gentoo-commits
commit: cf0db577362a4befb841b80d976a3b793f0c2a7e
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Fri Jan 8 20:40:15 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 8 20:40:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf0db577
profiles/*: document feature masking
Closes: https://github.com/gentoo/guru/pull/31
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
profiles/arch.list | 3 +++
profiles/arches.desc | 3 +++
profiles/default/linux/amd64/17.0/x32/parent | 7 +++++++
profiles/default/linux/amd64/17.1/hardened/selinux/parent | 7 +++++++
.../default/linux/amd64/17.1/no-multilib/hardened/selinux/parent | 7 +++++++
profiles/default/linux/amd64/17.1/selinux/parent | 7 +++++++
profiles/default/linux/x86/17.0/hardened/selinux/parent | 7 +++++++
profiles/default/linux/x86/17.0/selinux/parent | 7 +++++++
profiles/profiles.desc | 5 +++++
9 files changed, 53 insertions(+)
diff --git a/profiles/arch.list b/profiles/arch.list
index 136c05e0..5ed7343c 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -1 +1,4 @@
+# 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
index 08285f15..99924d62 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -1 +1,4 @@
+# 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/default/linux/amd64/17.0/x32/parent b/profiles/default/linux/amd64/17.0/x32/parent
index 13db7fc1..9f3a62d8 100644
--- a/profiles/default/linux/amd64/17.0/x32/parent
+++ b/profiles/default/linux/amd64/17.0/x32/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
gentoo:default/linux/amd64/17.0/x32
:default/linux/amd64/17.0/x32
diff --git a/profiles/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
index 285d54a1..1ea01a36 100644
--- a/profiles/default/linux/amd64/17.1/hardened/selinux/parent
+++ b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
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
index 71943202..d6737101 100644
--- a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
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
index d81c16d4..667ba52c 100644
--- a/profiles/default/linux/amd64/17.1/selinux/parent
+++ b/profiles/default/linux/amd64/17.1/selinux/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
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
index a5268223..6f067f1e 100644
--- a/profiles/default/linux/x86/17.0/hardened/selinux/parent
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
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
index ff294ced..6eab164c 100644
--- a/profiles/default/linux/x86/17.0/selinux/parent
+++ b/profiles/default/linux/x86/17.0/selinux/parent
@@ -1,2 +1,9 @@
+# Theo Anderson <telans@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
gentoo:default/linux/x86/17.0/selinux
:features/selinux
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ef44b2d6..313f3966 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -1,3 +1,8 @@
+# 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-10 11:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-10 11:31 [gentoo-commits] repo/proj/guru:master commit in: profiles/default/linux/amd64/17.0/x32/, Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox