commit: 9ea30a2c9388462c3f19442d2078c7c8ee913266
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 21:22:11 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 21:22:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea30a2c
profiles, 23.0: Move arm musl profiles to more consistent place
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../arm/23.0/{musl/armv6j => armv6j_hf/musl}/eapi | 0
.../{musl/armv6j => armv6j_hf/musl}/hardened/eapi | 0
.../armv6j => armv6j_hf/musl}/hardened/parent | 0
.../musl}/hardened/selinux/eapi | 0
.../musl}/hardened/selinux/parent | 0
.../{musl/armv6j => armv6j_hf/musl}/make.defaults | 0
.../default/linux/arm/23.0/armv6j_hf/musl/parent | 2 ++
.../arm/23.0/{musl/armv7a => armv7a_hf/musl}/eapi | 0
.../{musl/armv7a => armv7a_hf/musl}/hardened/eapi | 0
.../armv7a => armv7a_hf/musl}/hardened/parent | 0
.../musl}/hardened/selinux/eapi | 0
.../musl}/hardened/selinux/parent | 0
.../{musl/armv7a => armv7a_hf/musl}/make.defaults | 0
.../default/linux/arm/23.0/armv7a_hf/musl/parent | 2 ++
profiles/default/linux/arm/23.0/musl/armv6j/parent | 2 --
profiles/default/linux/arm/23.0/musl/armv7a/parent | 2 --
.../split-usr/{musl/armv6j => armv6j_hf/musl}/eapi | 0
.../{musl/armv6j => armv6j_hf/musl}/hardened/eapi | 0
.../armv6j => armv6j_hf/musl}/hardened/parent | 0
.../musl}/hardened/selinux/eapi | 0
.../musl}/hardened/selinux/parent | 0
.../{musl/armv6j => armv6j_hf/musl}/make.defaults | 0
.../linux/arm/23.0/split-usr/armv6j_hf/musl/parent | 2 ++
.../split-usr/{musl/armv7a => armv7a_hf/musl}/eapi | 0
.../{musl/armv7a => armv7a_hf/musl}/hardened/eapi | 0
.../armv7a => armv7a_hf/musl}/hardened/parent | 0
.../musl}/hardened/selinux/eapi | 0
.../musl}/hardened/selinux/parent | 0
.../{musl/armv7a => armv7a_hf/musl}/make.defaults | 0
.../linux/arm/23.0/split-usr/armv7a_hf/musl/parent | 2 ++
.../linux/arm/23.0/split-usr/musl/armv6j/parent | 1 -
.../linux/arm/23.0/split-usr/musl/armv7a/parent | 1 -
profiles/profiles.desc | 24 +++++++++++-----------
33 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/eapi
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/eapi
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/eapi
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/eapi
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/parent
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/parent
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux/eapi
diff --git
a/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux/parent
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux/parent
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/make.defaults
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv6j/make.defaults
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/make.defaults
diff --git a/profiles/default/linux/arm/23.0/armv6j_hf/musl/parent
b/profiles/default/linux/arm/23.0/armv6j_hf/musl/parent
new file mode 100644
index 000000000000..5bbe8700f1a6
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/eapi
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/eapi
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/eapi
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/eapi
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/parent
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/parent
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux/eapi
diff --git
a/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux/parent
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux/parent
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/make.defaults
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/arm/23.0/musl/armv7a/make.defaults
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/make.defaults
diff --git a/profiles/default/linux/arm/23.0/armv7a_hf/musl/parent
b/profiles/default/linux/arm/23.0/armv7a_hf/musl/parent
new file mode 100644
index 000000000000..5bbe8700f1a6
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/armv7a_hf/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/parent
b/profiles/default/linux/arm/23.0/musl/armv6j/parent
deleted file mode 100644
index 7648ec7e7c22..000000000000
--- a/profiles/default/linux/arm/23.0/musl/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/arm/armv6j
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/parent
b/profiles/default/linux/arm/23.0/musl/armv7a/parent
deleted file mode 100644
index b70a1c7befbc..000000000000
--- a/profiles/default/linux/arm/23.0/musl/armv7a/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/arm/armv7a
diff --git a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi
rename to profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi
rename to profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/parent
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent
rename to
profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/parent
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux/eapi
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi
rename to
profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux/parent
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent
rename to
profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux/parent
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults
rename to profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/make.defaults
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/parent
b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/parent
new file mode 100644
index 000000000000..b488e1ca01b8
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi
rename to profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/eapi
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi
rename to profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/parent
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent
rename to
profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/parent
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux/eapi
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi
rename to
profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux/eapi
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux/parent
similarity index 100%
rename from
profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent
rename to
profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux/parent
diff --git
a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults
rename to profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/make.defaults
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/parent
b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/parent
new file mode 100644
index 000000000000..b488e1ca01b8
--- /dev/null
+++ b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
b/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
b/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 5a9a2cf3ff9e..876b5902c5fe 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -515,18 +515,18 @@ arm
default/linux/arm/17.0/musl/armv6j/hardened/selinux exp
arm default/linux/arm/17.0/musl/armv7a
dev
arm default/linux/arm/17.0/musl/armv7a/hardened
exp
arm default/linux/arm/17.0/musl/armv7a/hardened/selinux
exp
-# arm default/linux/arm/23.0/armv6j_hf/musl
exp
-# arm default/linux/arm/23.0/armv6j_hf/musl/hardened
exp
-# arm default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux
exp
-# arm default/linux/arm/23.0/armv7a_hf/musl
exp
-# arm default/linux/arm/23.0/armv7a_hf/musl/hardened
exp
-# arm default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux
exp
-# arm default/linux/arm/23.0/split-usr/armv6j_hf/musl
exp
-# arm default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened
exp
-# arm
default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux exp
-# arm default/linux/arm/23.0/split-usr/armv7a_hf/musl
exp
-# arm default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened
exp
-# arm
default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux exp
+arm default/linux/arm/23.0/armv6j_hf/musl
exp
+arm default/linux/arm/23.0/armv6j_hf/musl/hardened
exp
+arm default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux
exp
+arm default/linux/arm/23.0/armv7a_hf/musl
exp
+arm default/linux/arm/23.0/armv7a_hf/musl/hardened
exp
+arm default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux
exp
+arm default/linux/arm/23.0/split-usr/armv6j_hf/musl
exp
+arm default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened
exp
+arm
default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux exp
+arm default/linux/arm/23.0/split-usr/armv7a_hf/musl
exp
+arm default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened
exp
+arm
default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux exp
arm64 default/linux/arm64/17.0/musl
dev
arm64 default/linux/arm64/17.0/musl/llvm
exp
arm64 default/linux/arm64/17.0/musl/hardened
exp
