Gentoo Archives: gentoo-commits

From: Theo Anderson <telans@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: profiles/default/linux/amd64/17.1/selinux/, ...
Date: Fri, 08 Jan 2021 20:46:46
Message-Id: 1610138415.cf0db577362a4befb841b80d976a3b793f0c2a7e.telans@gentoo
1 commit: cf0db577362a4befb841b80d976a3b793f0c2a7e
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Fri Jan 8 20:40:15 2021 +0000
4 Commit: Theo Anderson <telans <AT> posteo <DOT> de>
5 CommitDate: Fri Jan 8 20:40:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf0db577
7
8 profiles/*: document feature masking
9
10 Closes: https://github.com/gentoo/guru/pull/31
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
13
14 profiles/arch.list | 3 +++
15 profiles/arches.desc | 3 +++
16 profiles/default/linux/amd64/17.0/x32/parent | 7 +++++++
17 profiles/default/linux/amd64/17.1/hardened/selinux/parent | 7 +++++++
18 .../default/linux/amd64/17.1/no-multilib/hardened/selinux/parent | 7 +++++++
19 profiles/default/linux/amd64/17.1/selinux/parent | 7 +++++++
20 profiles/default/linux/x86/17.0/hardened/selinux/parent | 7 +++++++
21 profiles/default/linux/x86/17.0/selinux/parent | 7 +++++++
22 profiles/profiles.desc | 5 +++++
23 9 files changed, 53 insertions(+)
24
25 diff --git a/profiles/arch.list b/profiles/arch.list
26 index 136c05e0..5ed7343c 100644
27 --- a/profiles/arch.list
28 +++ b/profiles/arch.list
29 @@ -1 +1,4 @@
30 +# Theo Anderson <telans@××××××.de> (2021-01-06)
31 +# New arch created for the purpose of hiding profiles.
32 +# Assuming no one sets KEYWORDS="~hidden"
33 hidden
34
35 diff --git a/profiles/arches.desc b/profiles/arches.desc
36 index 08285f15..99924d62 100644
37 --- a/profiles/arches.desc
38 +++ b/profiles/arches.desc
39 @@ -1 +1,4 @@
40 +# Theo Anderson <telans@××××××.de> (2021-01-06)
41 +# Masked the new hidden arch as testing to keep
42 +# in line with no stable packages in ::guru
43 hidden testing
44
45 diff --git a/profiles/default/linux/amd64/17.0/x32/parent b/profiles/default/linux/amd64/17.0/x32/parent
46 index 13db7fc1..9f3a62d8 100644
47 --- a/profiles/default/linux/amd64/17.0/x32/parent
48 +++ b/profiles/default/linux/amd64/17.0/x32/parent
49 @@ -1,2 +1,9 @@
50 +# Theo Anderson <telans@××××××.de> (2021-01-06)
51 +# Paths relative to `profiles`. The first line denotes the
52 +# parent profile which should inherit any changes we make here.
53 +# The second line points to the location where the appropriate
54 +# masks or forces(?) are. It is important to keep the
55 +# changes separated per profile/feature in case a
56 +# parent profile picks up on changes intended for a different profile.
57 gentoo:default/linux/amd64/17.0/x32
58 :default/linux/amd64/17.0/x32
59
60 diff --git a/profiles/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
61 index 285d54a1..1ea01a36 100644
62 --- a/profiles/default/linux/amd64/17.1/hardened/selinux/parent
63 +++ b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
64 @@ -1,2 +1,9 @@
65 +# Theo Anderson <telans@××××××.de> (2021-01-06)
66 +# Paths relative to `profiles`. The first line denotes the
67 +# parent profile which should inherit any changes we make here.
68 +# The second line points to the location where the appropriate
69 +# masks or forces(?) are. It is important to keep the
70 +# changes separated per profile/feature in case a
71 +# parent profile picks up on changes intended for a different profile.
72 gentoo:default/linux/amd64/17.1/hardened/selinux
73 :features/selinux
74
75 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
76 index 71943202..d6737101 100644
77 --- a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
78 +++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
79 @@ -1,2 +1,9 @@
80 +# Theo Anderson <telans@××××××.de> (2021-01-06)
81 +# Paths relative to `profiles`. The first line denotes the
82 +# parent profile which should inherit any changes we make here.
83 +# The second line points to the location where the appropriate
84 +# masks or forces(?) are. It is important to keep the
85 +# changes separated per profile/feature in case a
86 +# parent profile picks up on changes intended for a different profile.
87 gentoo:default/linux/amd64/17.1/no-multilib/hardened/selinux
88 :features/selinux
89
90 diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent
91 index d81c16d4..667ba52c 100644
92 --- a/profiles/default/linux/amd64/17.1/selinux/parent
93 +++ b/profiles/default/linux/amd64/17.1/selinux/parent
94 @@ -1,2 +1,9 @@
95 +# Theo Anderson <telans@××××××.de> (2021-01-06)
96 +# Paths relative to `profiles`. The first line denotes the
97 +# parent profile which should inherit any changes we make here.
98 +# The second line points to the location where the appropriate
99 +# masks or forces(?) are. It is important to keep the
100 +# changes separated per profile/feature in case a
101 +# parent profile picks up on changes intended for a different profile.
102 gentoo:default/linux/amd64/17.1/selinux
103 :features/selinux
104
105 diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent
106 index a5268223..6f067f1e 100644
107 --- a/profiles/default/linux/x86/17.0/hardened/selinux/parent
108 +++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent
109 @@ -1,2 +1,9 @@
110 +# Theo Anderson <telans@××××××.de> (2021-01-06)
111 +# Paths relative to `profiles`. The first line denotes the
112 +# parent profile which should inherit any changes we make here.
113 +# The second line points to the location where the appropriate
114 +# masks or forces(?) are. It is important to keep the
115 +# changes separated per profile/feature in case a
116 +# parent profile picks up on changes intended for a different profile.
117 gentoo:default/linux/x86/17.0/hardened/selinux
118 :features/selinux
119
120 diff --git a/profiles/default/linux/x86/17.0/selinux/parent b/profiles/default/linux/x86/17.0/selinux/parent
121 index ff294ced..6eab164c 100644
122 --- a/profiles/default/linux/x86/17.0/selinux/parent
123 +++ b/profiles/default/linux/x86/17.0/selinux/parent
124 @@ -1,2 +1,9 @@
125 +# Theo Anderson <telans@××××××.de> (2021-01-06)
126 +# Paths relative to `profiles`. The first line denotes the
127 +# parent profile which should inherit any changes we make here.
128 +# The second line points to the location where the appropriate
129 +# masks or forces(?) are. It is important to keep the
130 +# changes separated per profile/feature in case a
131 +# parent profile picks up on changes intended for a different profile.
132 gentoo:default/linux/x86/17.0/selinux
133 :features/selinux
134
135 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
136 index ef44b2d6..313f3966 100644
137 --- a/profiles/profiles.desc
138 +++ b/profiles/profiles.desc
139 @@ -1,3 +1,8 @@
140 +# Theo Anderson <telans@××××××.de> (2021-01-06)
141 +# Create profiles with the hidden arch where dependency conflicts
142 +# arise and masks are needed. They must match :gentoo profiles.
143 +# Using parent files within the profiles allows gentoo: profiles
144 +# to inherit any ::guru masks we choose.
145 hidden default/linux/amd64/17.1/selinux dev
146 hidden default/linux/amd64/17.1/hardened/selinux dev
147 hidden default/linux/amd64/17.1/no-multilib/hardened/selinux dev