commit: 69afbb3382b4ce928ba02102607b7a574b6f1707
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 03:43:45 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 03:43:45 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=69afbb33
tools-musl: update to reflect new musl profile structure
tools-musl/portage.amd64.vanilla/profile/use.mask | 1 -
tools-musl/portage.armv7a.vanilla/profile/use.mask | 1 -
tools-musl/portage.i686.vanilla/profile/use.mask | 1 -
tools-musl/portage.mips32r2.vanilla/profile/use.mask | 1 -
tools-musl/portage.mipsel3.vanilla/profile/use.mask | 1 -
tools-musl/portage.ppc.vanilla/profile/use.mask | 1 -
tools-musl/run-armv7a.sh | 4 ++++
tools-musl/run-mips32r2.sh | 4 ++++
tools-musl/run-mipsel3.sh | 4 ++++
tools-musl/run-ppc.sh | 4 ++++
tools-musl/run.sh | 4 ++++
tools-musl/stage-all.conf.template | 2 +-
12 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/tools-musl/portage.amd64.vanilla/profile/use.mask
b/tools-musl/portage.amd64.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.amd64.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/portage.armv7a.vanilla/profile/use.mask
b/tools-musl/portage.armv7a.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.armv7a.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/portage.i686.vanilla/profile/use.mask
b/tools-musl/portage.i686.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.i686.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/portage.mips32r2.vanilla/profile/use.mask
b/tools-musl/portage.mips32r2.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.mips32r2.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/portage.mipsel3.vanilla/profile/use.mask
b/tools-musl/portage.mipsel3.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.mipsel3.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/portage.ppc.vanilla/profile/use.mask
b/tools-musl/portage.ppc.vanilla/profile/use.mask
deleted file mode 100644
index cf56f2f6..00000000
--- a/tools-musl/portage.ppc.vanilla/profile/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-hardened
diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index bdb4af52..dca3450a 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -20,6 +20,9 @@ prepare_confs() {
&& float="softfp" \
|| float="hardfloat"
+ local profile=${flavor}
+ [[ "${flavor}" == "vanilla" ]] && profile="default"
+
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-e "s:CSTAGE:${cstage}:g" \
@@ -29,6 +32,7 @@ prepare_confs() {
-e "s:TARCH:${tarch}:g" \
-e "s:gentoo-linux-musl:${float}-linux-musleabi:" \
-e "s:FLAVOR:${flavor}:g" \
+ -e "s:PROFILE:${profile}:g" \
-e "s:MYCATALYST:$(pwd):g" \
> stage${s}-${arch}-musl-${flavor}.conf
diff --git a/tools-musl/run-mips32r2.sh b/tools-musl/run-mips32r2.sh
index 14f6c1a5..07622eb4 100755
--- a/tools-musl/run-mips32r2.sh
+++ b/tools-musl/run-mips32r2.sh
@@ -15,6 +15,9 @@ prepare_confs() {
local tarch="${arch%32r2}"
local parch="${tarch}"
+ local profile=${flavor}
+ [[ "${flavor}" == "vanilla" ]] && profile="default"
+
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-e "s:CSTAGE:${cstage}:g" \
@@ -23,6 +26,7 @@ prepare_confs() {
-e "s:PARCH:${parch}:g" \
-e "s:TARCH:${tarch}:g" \
-e "s:FLAVOR:${flavor}:g" \
+ -e "s:PROFILE:${profile}:g" \
-e "s:MYCATALYST:$(pwd):g" \
-e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
-e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index f785b299..930f34af 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -15,6 +15,9 @@ prepare_confs() {
local tarch="${arch%3}"
local parch="mips/${tarch}"
+ local profile=${flavor}
+ [[ "${flavor}" == "vanilla" ]] && profile="default"
+
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-e "s:CSTAGE:${cstage}:g" \
@@ -23,6 +26,7 @@ prepare_confs() {
-e "s:PARCH:${parch}:g" \
-e "s:TARCH:${tarch}:g" \
-e "s:FLAVOR:${flavor}:g" \
+ -e "s:PROFILE:${profile}:g" \
-e "s:MYCATALYST:$(pwd):g" \
-e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
-e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
diff --git a/tools-musl/run-ppc.sh b/tools-musl/run-ppc.sh
index 9580bac4..2b985580 100755
--- a/tools-musl/run-ppc.sh
+++ b/tools-musl/run-ppc.sh
@@ -17,6 +17,9 @@ prepare_confs() {
local tarch="${arch}"
[[ "${arch}" == "ppc" ]] && tarch="powerpc"
+ local profile=${flavor}
+ [[ "${flavor}" == "vanilla" ]] && profile="default"
+
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-e "s:CSTAGE:${cstage}:g" \
@@ -25,6 +28,7 @@ prepare_confs() {
-e "s:PARCH:${parch}:g" \
-e "s:TARCH:${tarch}:g" \
-e "s:FLAVOR:${flavor}:g" \
+ -e "s:PROFILE:${profile}:g" \
-e "s:MYCATALYST:$(pwd):g" \
> stage${s}-${arch}-musl-${flavor}.conf
diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index cbd9b875..cda71d0f 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -19,6 +19,9 @@ prepare_confs() {
local tarch="${arch}"
[[ "${arch}" == "amd64" ]] && tarch="x86_64"
+ local profile=${flavor}
+ [[ "${flavor}" == "vanilla" ]] && profile="default"
+
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-e "s:CSTAGE:${cstage}:g" \
@@ -27,6 +30,7 @@ prepare_confs() {
-e "s:PARCH:${parch}:g" \
-e "s:TARCH:${tarch}:g" \
-e "s:FLAVOR:${flavor}:g" \
+ -e "s:PROFILE:${profile}:g" \
-e "s:MYCATALYST:$(pwd):g" \
> stage${s}-${arch}-musl-${flavor}.conf
diff --git a/tools-musl/stage-all.conf.template
b/tools-musl/stage-all.conf.template
index 9a3fdfc2..a93d8659 100644
--- a/tools-musl/stage-all.conf.template
+++ b/tools-musl/stage-all.conf.template
@@ -2,7 +2,7 @@ subarch: SARCH
target: CSTAGE
version_stamp: musl-FLAVOR
rel_type: musl/FLAVOR/SARCH
-profile: hardened/linux/musl/PARCH
+profile: PROFILE/linux/musl/PARCH
snapshot: current
source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
chost: TARCH-gentoo-linux-musl
