profiles: hardened/linux/musl inherits from default/linux/musl

Signed-off-by: Anthony G. Basile <[email protected]>
johu · Dec 13, 2017 · b9ad142 · b9ad142
1 parent bdc92b5
commit b9ad142
Show file tree

Hide file tree

Showing 50 changed files with 11 additions and 543 deletions.
diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults
diff --git a/profiles/hardened/linux/musl/amd64/package.mask b/profiles/hardened/linux/musl/amd64/package.mask
diff --git a/profiles/hardened/linux/musl/amd64/package.use.force b/profiles/hardened/linux/musl/amd64/package.use.force
diff --git a/profiles/hardened/linux/musl/amd64/package.use.mask b/profiles/hardened/linux/musl/amd64/package.use.mask
diff --git a/profiles/hardened/linux/musl/amd64/parent b/profiles/hardened/linux/musl/amd64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/amd64
 ..
diff --git a/profiles/hardened/linux/musl/amd64/use.force b/profiles/hardened/linux/musl/amd64/use.force
diff --git a/profiles/hardened/linux/musl/amd64/use.mask b/profiles/hardened/linux/musl/amd64/use.mask
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/amd64/x32
 ..
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.force b/profiles/hardened/linux/musl/amd64/x32/use.force
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.mask b/profiles/hardened/linux/musl/amd64/x32/use.mask
diff --git a/profiles/hardened/linux/musl/arm/armv7a/make.defaults b/profiles/hardened/linux/musl/arm/armv7a/make.defaults
diff --git a/profiles/hardened/linux/musl/arm/armv7a/parent b/profiles/hardened/linux/musl/arm/armv7a/parent
@@ -1 +1,3 @@
+../../../../../default/linux/musl/arm/armv7a
 ..
+../..
diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/hardened/linux/musl/arm/make.defaults
diff --git a/profiles/hardened/linux/musl/arm/package.use.force b/profiles/hardened/linux/musl/arm/package.use.force
diff --git a/profiles/hardened/linux/musl/arm/parent b/profiles/hardened/linux/musl/arm/parent
diff --git a/profiles/hardened/linux/musl/arm/use.force b/profiles/hardened/linux/musl/arm/use.force
diff --git a/profiles/hardened/linux/musl/arm/use.mask b/profiles/hardened/linux/musl/arm/use.mask
diff --git a/profiles/hardened/linux/musl/arm64/make.defaults b/profiles/hardened/linux/musl/arm64/make.defaults
diff --git a/profiles/hardened/linux/musl/arm64/package.use.force b/profiles/hardened/linux/musl/arm64/package.use.force
diff --git a/profiles/hardened/linux/musl/arm64/parent b/profiles/hardened/linux/musl/arm64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/arm64
 ..
diff --git a/profiles/hardened/linux/musl/arm64/use.force b/profiles/hardened/linux/musl/arm64/use.force
diff --git a/profiles/hardened/linux/musl/arm64/use.mask b/profiles/hardened/linux/musl/arm64/use.mask
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
@@ -1,15 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="hardened nptl pic unicode -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pic -berkdb -jit -nls -orc"
-
-SYMLINK_LIB="no"
-
-# TODO: fix so musl doesn't generate this for all packages
-# that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias"
+USE="${USE} hardened pic -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/hardened/linux/musl/mips/make.defaults
diff --git a/profiles/hardened/linux/musl/mips/mipsel/make.defaults b/profiles/hardened/linux/musl/mips/mipsel/make.defaults
diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/mips/mipsel
 ..
diff --git a/profiles/hardened/linux/musl/mips/package.mask b/profiles/hardened/linux/musl/mips/package.mask
diff --git a/profiles/hardened/linux/musl/mips/package.use.force b/profiles/hardened/linux/musl/mips/package.use.force
diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/mips
 ..
diff --git a/profiles/hardened/linux/musl/mips/use.force b/profiles/hardened/linux/musl/mips/use.force
diff --git a/profiles/hardened/linux/musl/mips/use.mask b/profiles/hardened/linux/musl/mips/use.mask