tools-musl: update to reflect new musl profile structure

tools-musl/portage.amd64.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

tools-musl/portage.armv7a.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

tools-musl/portage.i686.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

tools-musl/portage.mips32r2.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

tools-musl/portage.mipsel3.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

tools-musl/portage.ppc.vanilla/profile/use.mask

@@ -1 +0,0 @@
-hardened

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
 

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|" \

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|" \

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
 

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
 

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