| 1 |
commit: 1fe0bb847fc92c345dbcce5e820276716a0fbacd |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 15:32:06 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 15:40:27 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe0bb84 |
| 7 |
|
| 8 |
profiles/arch: elaborate on 'apparmor' USE mask |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/arch/amd64/use.mask | 3 +++ |
| 13 |
profiles/arch/arm64/use.mask | 3 +++ |
| 14 |
profiles/arch/base/use.mask | 3 +++ |
| 15 |
profiles/arch/x86/package.use.mask | 9 --------- |
| 16 |
profiles/arch/x86/use.mask | 4 ---- |
| 17 |
profiles/arch/x86/use.stable.mask | 6 +----- |
| 18 |
6 files changed, 10 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask |
| 21 |
index 7e8fbecd25e4..19ac88e44f05 100644 |
| 22 |
--- a/profiles/arch/amd64/use.mask |
| 23 |
+++ b/profiles/arch/amd64/use.mask |
| 24 |
@@ -40,7 +40,10 @@ |
| 25 |
-firebird |
| 26 |
|
| 27 |
# Mike Gilbert <floppym@g.o> (2014-10-19) |
| 28 |
+# Requires the following packages to be keyworded/stable: |
| 29 |
# sys-libs/libapparmor |
| 30 |
+# sys-apps/apparmor |
| 31 |
+# sys-apps/apparmor-utils |
| 32 |
-apparmor |
| 33 |
|
| 34 |
# Michał Górny <mgorny@g.o> (2014-03-30) |
| 35 |
|
| 36 |
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask |
| 37 |
index e4d3133be075..1aa7b0ba54ab 100644 |
| 38 |
--- a/profiles/arch/arm64/use.mask |
| 39 |
+++ b/profiles/arch/arm64/use.mask |
| 40 |
@@ -5,7 +5,10 @@ |
| 41 |
-arm64 |
| 42 |
|
| 43 |
# Mike Gilbert <floppym@g.o> (2022-08-31) |
| 44 |
+# Requires the following packages to be keyworded/stable: |
| 45 |
# sys-libs/libapparmor |
| 46 |
+# sys-apps/apparmor |
| 47 |
+# sys-apps/apparmor-utils |
| 48 |
-apparmor |
| 49 |
|
| 50 |
# David Seifert <soap@g.o> (2022-03-13) |
| 51 |
|
| 52 |
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask |
| 53 |
index 8c35c3fc8a27..499c69aadc54 100644 |
| 54 |
--- a/profiles/arch/base/use.mask |
| 55 |
+++ b/profiles/arch/base/use.mask |
| 56 |
@@ -208,7 +208,10 @@ sbcl |
| 57 |
systemd |
| 58 |
|
| 59 |
# Mike Gilbert <floppym@g.o> (2014-10-19) |
| 60 |
+# Requires the following packages to be keyworded/stable: |
| 61 |
# sys-libs/libapparmor |
| 62 |
+# sys-apps/apparmor |
| 63 |
+# sys-apps/apparmor-utils |
| 64 |
apparmor |
| 65 |
|
| 66 |
# Mask flags that correspond to all possible ARCH values. |
| 67 |
|
| 68 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
| 69 |
index 2b94caf6bae8..588a4257a3c8 100644 |
| 70 |
--- a/profiles/arch/x86/package.use.mask |
| 71 |
+++ b/profiles/arch/x86/package.use.mask |
| 72 |
@@ -43,10 +43,6 @@ media-video/ffmpeg amf |
| 73 |
# Only supports cpu_flags_x86_aes in 64-bit mode |
| 74 |
net-fs/samba cpu_flags_x86_aes |
| 75 |
|
| 76 |
-# Conrad Kostecki <conikost@g.o> (2021-11-16) |
| 77 |
-# AppArmor is not available on x86 |
| 78 |
-app-benchmarks/stress-ng apparmor |
| 79 |
- |
| 80 |
# James Le Cuirot <chewi@g.o> (2021-10-22) |
| 81 |
# The JIT feature only works on amd64 and x86. |
| 82 |
app-emulation/fs-uae -jit |
| 83 |
@@ -150,11 +146,6 @@ dev-python/influxdb test |
| 84 |
# clisp is keyworded on x86 |
| 85 |
app-text/texlive-core -xindy |
| 86 |
|
| 87 |
-# Joonas Niilola <juippis@g.o> (2020-05-14) |
| 88 |
-# sys-apps/apparmor not keyworded on x86. |
| 89 |
-app-containers/lxc apparmor |
| 90 |
-app-containers/lxd apparmor |
| 91 |
- |
| 92 |
# Georgy Yakovlev <gyakovlev@g.o (2020-04-26) |
| 93 |
# static-pie works on x86, #719444 |
| 94 |
sys-libs/glibc -static-pie |
| 95 |
|
| 96 |
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask |
| 97 |
index a221468a59a2..fefef575af00 100644 |
| 98 |
--- a/profiles/arch/x86/use.mask |
| 99 |
+++ b/profiles/arch/x86/use.mask |
| 100 |
@@ -34,10 +34,6 @@ |
| 101 |
# dev-db/firebird is keyworded ~x86 |
| 102 |
-firebird |
| 103 |
|
| 104 |
-# Mike Gilbert <floppym@g.o (2014-10-19) |
| 105 |
-# sys-libs/libapparmor |
| 106 |
--apparmor |
| 107 |
- |
| 108 |
# Michał Górny <mgorny@g.o> (2014-03-30) |
| 109 |
# PyPy is keyworded on this arch. |
| 110 |
-python_targets_pypy3 |
| 111 |
|
| 112 |
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask |
| 113 |
index 58b15063cd35..093b69d79a82 100644 |
| 114 |
--- a/profiles/arch/x86/use.stable.mask |
| 115 |
+++ b/profiles/arch/x86/use.stable.mask |
| 116 |
@@ -1,4 +1,4 @@ |
| 117 |
-# Copyright 1999-2021 Gentoo Authors |
| 118 |
+# Copyright 1999-2022 Gentoo Authors |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
|
| 121 |
# This file requires eapi 5 or later. New entries go on top. |
| 122 |
@@ -18,10 +18,6 @@ mkl |
| 123 |
# dev-db/firebird is keyworded ~x86 |
| 124 |
firebird |
| 125 |
|
| 126 |
-# Mike Gilbert <floppym@g.o> (2014-10-19) |
| 127 |
-# sys-libs/libapparmor |
| 128 |
-apparmor |
| 129 |
- |
| 130 |
# Michał Górny <mgorny@g.o> (2014-03-30) |
| 131 |
# PyPy is unstable on this arch. |
| 132 |
python_targets_pypy3 |
Archives