profiles: split 23.0 armv6j profiles up into sf and hf

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

46 files changed, 103 insertions, 13 deletions

diff --git a/profiles/default/linux/arm/23.0/armv6j/eapi b/profiles/arch/arm/23.0-armv6j_hf/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/armv6j/eapi
+++ b/profiles/arch/arm/23.0-armv6j_hf/eapi
diff --git a/profiles/arch/arm/23.0-armv6j_hf/make.defaults b/profiles/arch/arm/23.0-armv6j_hf/make.defaults
new file mode 100644
index 000000000000..f23e0de09e37
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_hf/make.defaults
@@ -0,0 +1,7 @@
+CHOST="armv6j-unknown-linux-gnueabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/23.0-armv6j_hf/package.use.mask b/profiles/arch/arm/23.0-armv6j_hf/package.use.mask
new file mode 100644
index 000000000000..20a7e47e59bf
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_hf/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-07-04)
+# Rust is available here
+# Bug #728558
+media-video/ffmpeg -rav1e
diff --git a/profiles/arch/arm/23.0-armv6j_hf/parent b/profiles/arch/arm/23.0-armv6j_hf/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_hf/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/23.0-armv6j_hf/use.force b/profiles/arch/arm/23.0-armv6j_hf/use.force
new file mode 100644
index 000000000000..e5abb15cbb95
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_hf/use.force
@@ -0,0 +1,7 @@
+# Force armv6 specific USE flags
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+
+cpu_flags_arm_edsp
+cpu_flags_arm_thumb
diff --git a/profiles/arch/arm/23.0-armv6j_hf/use.mask b/profiles/arch/arm/23.0-armv6j_hf/use.mask
new file mode 100644
index 000000000000..5a841abd6e10
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_hf/use.mask
@@ -0,0 +1,8 @@
+# Unmask armv6 specific USE flags
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+
+-cpu_flags_arm_edsp
+-cpu_flags_arm_thumb
+-cpu_flags_arm_vfp
diff --git a/profiles/default/linux/arm/23.0/armv6j/hardened/eapi b/profiles/arch/arm/23.0-armv6j_sf/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/armv6j/hardened/eapi
+++ b/profiles/arch/arm/23.0-armv6j_sf/eapi
diff --git a/profiles/arch/arm/23.0-armv6j_sf/make.defaults b/profiles/arch/arm/23.0-armv6j_sf/make.defaults
new file mode 100644
index 000000000000..5e0bfdd14143
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_sf/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-softfp-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=softfp"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/23.0-armv6j_sf/package.use.mask b/profiles/arch/arm/23.0-armv6j_sf/package.use.mask
new file mode 100644
index 000000000000..20a7e47e59bf
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_sf/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-07-04)
+# Rust is available here
+# Bug #728558
+media-video/ffmpeg -rav1e
diff --git a/profiles/arch/arm/23.0-armv6j_sf/parent b/profiles/arch/arm/23.0-armv6j_sf/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_sf/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/23.0-armv6j_sf/use.force b/profiles/arch/arm/23.0-armv6j_sf/use.force
new file mode 100644
index 000000000000..e5abb15cbb95
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_sf/use.force
@@ -0,0 +1,7 @@
+# Force armv6 specific USE flags
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+
+cpu_flags_arm_edsp
+cpu_flags_arm_thumb
diff --git a/profiles/arch/arm/23.0-armv6j_sf/use.mask b/profiles/arch/arm/23.0-armv6j_sf/use.mask
new file mode 100644
index 000000000000..5a841abd6e10
--- /dev/null
+++ b/profiles/arch/arm/23.0-armv6j_sf/use.mask
@@ -0,0 +1,8 @@
+# Unmask armv6 specific USE flags
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+
+-cpu_flags_arm_edsp
+-cpu_flags_arm_thumb
+-cpu_flags_arm_vfp
diff --git a/profiles/default/linux/arm/23.0/armv6j/parent b/profiles/default/linux/arm/23.0/armv6j/parent
deleted file mode 100644
index f61eccdfba43..000000000000
--- a/profiles/default/linux/arm/23.0/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv6j
diff --git a/profiles/default/linux/arm/23.0/armv6j/selinux/parent b/profiles/default/linux/arm/23.0/armv6j/selinux/parent
deleted file mode 100644
index 2190e9797eaa..000000000000
--- a/profiles/default/linux/arm/23.0/armv6j/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/selinux
diff --git a/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi b/profiles/default/linux/arm/23.0/armv6j_hf/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/eapi
diff --git a/profiles/default/linux/arm/23.0/armv6j/selinux/eapi b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/armv6j/selinux/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/eapi
diff --git a/profiles/default/linux/arm/23.0/armv6j/hardened/parent b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/parent
index b7aa1e71208a..b7aa1e71208a 100644
--- a/profiles/default/linux/arm/23.0/armv6j/hardened/parent
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/parent
diff --git a/profiles/default/linux/arm/23.0/armv6j/systemd/eapi b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/selinux/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/armv6j/systemd/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/selinux/eapi
diff --git a/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/selinux/parent
index 23c64bb44399..23c64bb44399 100644
--- a/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/hardened/selinux/parent
diff --git a/profiles/default/linux/arm/23.0/armv6j_hf/parent b/profiles/default/linux/arm/23.0/armv6j_hf/parent
new file mode 100644
index 000000000000..e6d254b7144d
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/23.0-armv6j_hf
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi b/profiles/default/linux/arm/23.0/armv6j_hf/systemd/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/systemd/eapi
diff --git a/profiles/default/linux/arm/23.0/armv6j/systemd/parent b/profiles/default/linux/arm/23.0/armv6j_hf/systemd/parent
index 7e061533c151..7e061533c151 100644
--- a/profiles/default/linux/arm/23.0/armv6j/systemd/parent
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/systemd/parent
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi b/profiles/default/linux/arm/23.0/armv6j_sf/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/eapi
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/eapi
diff --git a/profiles/default/linux/arm/23.0/armv6j_sf/hardened/parent b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/parent
new file mode 100644
index 000000000000..b7aa1e71208a
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/selinux/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/selinux/eapi
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/selinux/parent
index 23c64bb44399..23c64bb44399 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/hardened/selinux/parent
diff --git a/profiles/default/linux/arm/23.0/armv6j_sf/parent b/profiles/default/linux/arm/23.0/armv6j_sf/parent
new file mode 100644
index 000000000000..e6d254b7144d
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/23.0-armv6j_hf
diff --git a/profiles/default/linux/arm/23.0/armv6j_sf/systemd/eapi b/profiles/default/linux/arm/23.0/armv6j_sf/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/armv6j_sf/systemd/parent b/profiles/default/linux/arm/23.0/armv6j_sf/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_sf/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j/parent
deleted file mode 100644
index 7648ec7e7c22..000000000000
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/arm/armv6j
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/parent
index 448e8b0705b6..448e8b0705b6 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/parent
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux/parent
index 23c5fe07a248..23c5fe07a248 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux/parent
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/parent
new file mode 100644
index 000000000000..23cf6b6a89de
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/23.0-armv6j_hf
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/parent
new file mode 100644
index 000000000000..448e8b0705b6
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/arm
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/parent
new file mode 100644
index 000000000000..23c5fe07a248
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/parent
new file mode 100644
index 000000000000..04a7db3e5f2d
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/23.0-armv6j_sf
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/eapi b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/parent b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_sf/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b467ad8ab708..afbc08475573 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -131,10 +131,14 @@ arm		default/linux/arm/23.0/armv4t					exp
 arm		default/linux/arm/23.0/armv4t/systemd				exp
 arm		default/linux/arm/23.0/armv5te					exp
 arm		default/linux/arm/23.0/armv5te/systemd				exp
-arm		default/linux/arm/23.0/armv6j					exp
-arm		default/linux/arm/23.0/armv6j/hardened				exp
-arm		default/linux/arm/23.0/armv6j/hardened/selinux			exp
-arm		default/linux/arm/23.0/armv6j/systemd				exp
+arm		default/linux/arm/23.0/armv6j_sf				exp
+arm		default/linux/arm/23.0/armv6j_sf/hardened			exp
+arm		default/linux/arm/23.0/armv6j_sf/hardened/selinux		exp
+arm		default/linux/arm/23.0/armv6j_sf/systemd			exp
+arm		default/linux/arm/23.0/armv6j_hf				exp
+arm		default/linux/arm/23.0/armv6j_hf/hardened			exp
+arm		default/linux/arm/23.0/armv6j_hf/hardened/selinux		exp
+arm		default/linux/arm/23.0/armv6j_hf/systemd			exp
 arm		default/linux/arm/23.0/armv7a					exp
 arm		default/linux/arm/23.0/armv7a/hardened				exp
 arm		default/linux/arm/23.0/armv7a/hardened/selinux			exp
@@ -151,9 +155,12 @@ arm		default/linux/arm/23.0/split-usr/desktop/plasma			exp
 arm		default/linux/arm/23.0/split-usr/armv4				exp
 arm		default/linux/arm/23.0/split-usr/armv4t				exp
 arm		default/linux/arm/23.0/split-usr/armv5te			exp
-arm		default/linux/arm/23.0/split-usr/armv6j				exp
-arm		default/linux/arm/23.0/split-usr/armv6j/hardened		exp
-arm		default/linux/arm/23.0/split-usr/armv6j/hardened/selinux	exp
+arm		default/linux/arm/23.0/split-usr/armv6j_sf			exp
+arm		default/linux/arm/23.0/split-usr/armv6j_sf/hardened		exp
+arm		default/linux/arm/23.0/split-usr/armv6j_sf/hardened/selinux	exp
+arm		default/linux/arm/23.0/split-usr/armv6j_hf			exp
+arm		default/linux/arm/23.0/split-usr/armv6j_hf/hardened		exp
+arm		default/linux/arm/23.0/split-usr/armv6j_hf/hardened/selinux	exp
 arm		default/linux/arm/23.0/split-usr/armv7a				exp
 arm		default/linux/arm/23.0/split-usr/armv7a/hardened		exp
 arm		default/linux/arm/23.0/split-usr/armv7a/hardened/selinux	exp