profiles: rearrange profiles

Rearrange the profiles and fix building on musl.
2026-01-25 12:25:32 +02:00
parent 1cb31ca1de
commit d9adfc20f2
30 changed files with 64 additions and 19 deletions
--- a/profiles/linux/arch/amd64/busybox/musl/parent
+++ b/profiles/linux/arch/amd64/busybox/musl/parent
@@ -1,2 +1,2 @@
 ..
-gentoo:features/musl
+../../features/musl
--- a/profiles/linux/arch/amd64/busybox/parent
+++ b/profiles/linux/arch/amd64/busybox/parent
@@ -1,6 +1,2 @@
-../../../gentoo/base
-../../../gentoo/default
-gentoo:arch/amd64
-gentoo:arch/amd64/no-multilib
-gentoo:features/merged-usr
-../../../minimal
+..
+../../../features/busybox
--- a/profiles/linux/arch/amd64/features/musl/eapi
+++ b/profiles/linux/arch/amd64/features/musl/eapi
--- a/profiles/linux/arch/amd64/features/musl/make.defaults
+++ b/profiles/linux/arch/amd64/features/musl/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-pc-linux-musl"
+
+# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
--- a/profiles/linux/arch/amd64/features/musl/package.mask
+++ b/profiles/linux/arch/amd64/features/musl/package.mask
@@ -0,0 +1,15 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-08)
+# openjdk-bin is available on amd64 musl
+-dev-java/openjdk-bin
+dev-java/openjdk-bin:8
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# rust-bin is available on amd64 musl
+-dev-lang/rust-bin
+
+# Sebastian Parborg <darkdefende@gmail.com> (2025-01-21)
+# blender-bin is only compatible with glibc
+media-gfx/blender-bin
--- a/profiles/linux/arch/amd64/features/musl/package.use.mask
+++ b/profiles/linux/arch/amd64/features/musl/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# upstream does not provide docs in musl tarball
+dev-lang/rust-bin doc
--- a/profiles/linux/arch/amd64/features/musl/parent
+++ b/profiles/linux/arch/amd64/features/musl/parent
@@ -0,0 +1,2 @@
+../../../../features/musl
+../../../../features/installmask
--- a/profiles/linux/arch/amd64/gnu/musl/make.defaults
+++ b/profiles/linux/arch/amd64/gnu/musl/make.defaults
@@ -1 +0,0 @@
-CHOST="x86_64-pc-linux-musl"
--- a/profiles/linux/arch/amd64/gnu/musl/packages
+++ b/profiles/linux/arch/amd64/gnu/musl/packages
@@ -1 +0,0 @@
-*sys-libs/musl
--- a/profiles/linux/arch/amd64/gnu/musl/parent
+++ b/profiles/linux/arch/amd64/gnu/musl/parent
@@ -1,2 +1,2 @@
 ..
-gentoo:features/musl
+../../features/musl
--- a/profiles/linux/arch/amd64/gnu/parent
+++ b/profiles/linux/arch/amd64/gnu/parent
@@ -1,6 +1,2 @@
-../../../gentoo/base
-../../../gentoo/default
-gentoo:arch/amd64
-gentoo:arch/amd64/no-multilib
-gentoo:features/merged-usr
-../../../minimal
+..
+../../../features/gnu
--- a/profiles/linux/arch/amd64/parent
+++ b/profiles/linux/arch/amd64/parent
@@ -0,0 +1,7 @@
+../../gentoo/base
+../../gentoo/default
+gentoo:arch/amd64
+gentoo:arch/amd64/no-multilib
+gentoo:features/merged-usr
+../../features/minimal
+../../features/installmask
--- a/profiles/linux/features/busybox/eapi
+++ b/profiles/linux/features/busybox/eapi
@@ -0,0 +1 @@
+5
--- a/profiles/linux/arch/amd64/busybox/make.defaults
+++ b/profiles/linux/arch/amd64/busybox/make.defaults
--- a/profiles/linux/arch/amd64/busybox/package.use
+++ b/profiles/linux/arch/amd64/busybox/package.use
--- a/profiles/linux/arch/amd64/busybox/packages
+++ b/profiles/linux/arch/amd64/busybox/packages
--- a/profiles/linux/features/gnu/eapi
+++ b/profiles/linux/features/gnu/eapi
@@ -0,0 +1 @@
+5
--- a/profiles/linux/arch/amd64/gnu/make.defaults
+++ b/profiles/linux/arch/amd64/gnu/make.defaults
--- a/profiles/linux/arch/amd64/gnu/packages
+++ b/profiles/linux/arch/amd64/gnu/packages
--- a/profiles/linux/features/installmask/eapi
+++ b/profiles/linux/features/installmask/eapi
@@ -0,0 +1 @@
+5
--- a/profiles/linux/features/installmask/make.defaults
+++ b/profiles/linux/features/installmask/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+INSTALL_MASK="${INSTALL_MASK} /usr/share/doc /usr/share/man /usr/share/locale /usr/lib64/pkgconfig /usr/include /usr/share/info /usr/lib*/python*/test"
--- a/profiles/linux/features/minimal/eapi
+++ b/profiles/linux/features/minimal/eapi
@@ -0,0 +1 @@
+5
--- a/profiles/linux/features/minimal/make.defaults
+++ b/profiles/linux/features/minimal/make.defaults
@@ -3,5 +3,3 @@

 USE="pam pcre zlib ipv6 minimal ssl"
 USE="${USE} -acl -xattr -fortran -ncurses -readline -static-libs -nls -multiarch -kmod -seccomp"
-
-INSTALL_MASK="/usr/share/doc /usr/share/man /usr/share/locale /usr/lib64/pkgconfig /usr/include /usr/share/info /usr/lib*/python*/test"
--- a/profiles/linux/features/minimal/package.use
+++ b/profiles/linux/features/minimal/package.use
--- a/profiles/linux/features/minimal/package.use.force
+++ b/profiles/linux/features/minimal/package.use.force
--- a/profiles/linux/features/minimal/packages
+++ b/profiles/linux/features/minimal/packages
--- a/profiles/linux/features/musl/eapi
+++ b/profiles/linux/features/musl/eapi
@@ -0,0 +1 @@
+5
--- a/profiles/linux/features/musl/packages
+++ b/profiles/linux/features/musl/packages
@@ -0,0 +1,4 @@
+-*app-misc/pax-utils
+-*sys-apps/sandbox
+
+*sys-libs/musl
--- a/profiles/linux/features/musl/parent
+++ b/profiles/linux/features/musl/parent
@@ -0,0 +1 @@
+gentoo:features/musl
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -1,7 +1,10 @@
 # Copyright 2003-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Minimal profiles
 amd64		linux/arch/amd64/gnu							exp
-amd64		linux/arch/amd64/gnu/musl						exp
 amd64		linux/arch/amd64/busybox						exp
+
+# Minimal musl profiles
+amd64		linux/arch/amd64/gnu/musl						exp
 amd64		linux/arch/amd64/busybox/musl						exp