gentoo auto-resync : 10:12:2022 - 21:21:18

7 files changed, 11 insertions, 14 deletions

diff --git a/profiles/default/linux/amd64/23.0/readme.txt b/profiles/default/linux/amd64/23.0/readme.txt
index 4554ad58a9c2..a4fb52c03bc5 100644
--- a/profiles/default/linux/amd64/23.0/readme.txt
+++ b/profiles/default/linux/amd64/23.0/readme.txt
@@ -8,7 +8,7 @@ default/linux/amd64/17.1
 ==> default/linux/amd64/23.0/split-usr
 
 default/linux/amd64/17.1/selinux
-==> default/linux/amd64/23.0/split-usr/selinux
+==> default/linux/amd64/23.0/split-usr/hardened/selinux [%]
 
 default/linux/amd64/17.1/hardened
 ==> default/linux/amd64/23.0/split-usr/hardened
@@ -62,10 +62,10 @@ default/linux/amd64/17.1/no-multilib/systemd/merged-usr
 ==> default/linux/amd64/23.0/no-multilib/systemd
 
 default/linux/amd64/17.1/no-multilib/systemd/selinux
-==> default/linux/amd64/23.0/no-multilib/selinux/systemd  [*]
+==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [*,%]
 
 default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr
-==> default/linux/amd64/23.0/no-multilib/selinux/systemd
+==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [%]
 
 default/linux/amd64/17.1/systemd
 ==> default/linux/amd64/23.0/systemd  [*]
@@ -74,10 +74,10 @@ default/linux/amd64/17.1/systemd/merged-usr
 ==> default/linux/amd64/23.0/systemd
 
 default/linux/amd64/17.1/systemd/selinux
-==> default/linux/amd64/23.0/selinux/systemd  [*]
+==> default/linux/amd64/23.0/hardened/selinux/systemd  [*,%]
 
 default/linux/amd64/17.1/systemd/selinux/merged-usr
-==> default/linux/amd64/23.0/selinux/systemd
+==> default/linux/amd64/23.0/hardened/selinux/systemd  [%]
 
 default/linux/amd64/17.1/clang
 ==> default/linux/amd64/23.0/split-usr/llvm
@@ -98,12 +98,16 @@ default/linux/amd64/17.0/x32/systemd/merged-usr
 ==> default/linux/amd64/23.0/x32/systemd
 
 default/linux/amd64/17.0/musl
+==> default/linux/amd64/23.0/split-usr/musl
 
 default/linux/amd64/17.0/musl/clang
+==> default/linux/amd64/23.0/split-usr/musl/llvm
 
 default/linux/amd64/17.0/musl/hardened
+==> default/linux/amd64/23.0/split-usr/musl/hardened
 
 default/linux/amd64/17.0/musl/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/musl/hardened/selinux
 
 default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+
 ==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+  [&]
@@ -133,3 +137,5 @@ default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+
     to your make.conf.
 
 [&] You will have to do the symlink migration from 17.0 to 17.1 first.
+
+[%] There are no standalone selinux profiles anymore, only hardened/selinux.
diff --git a/profiles/default/linux/amd64/23.0/selinux/eapi b/profiles/default/linux/amd64/23.0/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/23.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/23.0/selinux/parent b/profiles/default/linux/amd64/23.0/selinux/parent
deleted file mode 100644
index 933e67923d1a..000000000000
--- a/profiles/default/linux/amd64/23.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/23.0/selinux/systemd/eapi b/profiles/default/linux/amd64/23.0/selinux/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/23.0/selinux/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/23.0/selinux/systemd/parent b/profiles/default/linux/amd64/23.0/selinux/systemd/parent
deleted file mode 100644
index 7e061533c151..000000000000
--- a/profiles/default/linux/amd64/23.0/selinux/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/23.0/split-usr/selinux/eapi b/profiles/default/linux/amd64/23.0/split-usr/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/23.0/split-usr/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/23.0/split-usr/selinux/parent b/profiles/default/linux/amd64/23.0/split-usr/selinux/parent
deleted file mode 100644
index 2190e9797eaa..000000000000
--- a/profiles/default/linux/amd64/23.0/split-usr/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/selinux