tools-uclibc: accomodate new profile structure, bug #519686

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

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

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

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

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

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

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

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

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

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

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

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

tools-uclibc/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-uclibc:${float}-linux-uclibceabi:" \
         -e "s:FLAVOR:${flavor}:g" \
+        -e "s:PROFILE:${profile}:g" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-uclibc-${flavor}.conf
 

tools-uclibc/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" \
         >  stage${s}-${arch}-uclibc-${flavor}.conf
   done

tools-uclibc/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" \
         >  stage${s}-${arch}-uclibc-${flavor}.conf
   done

tools-uclibc/run-ppc.sh

@@ -18,6 +18,9 @@ prepare_confs() {
     local parch="${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" \
@@ -26,6 +29,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}-uclibc-${flavor}.conf
   done

tools-uclibc/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}-uclibc-${flavor}.conf
   done

tools-uclibc/stage-all.conf.template

@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: uclibc-FLAVOR
 rel_type: uclibc/FLAVOR/SARCH
-profile: hardened/linux/uclibc/PARCH
+profile: PROFILE/linux/uclibc/PARCH
 snapshot: current
 source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR
 chost: TARCH-gentoo-linux-uclibc