From 2d9492ca73866956881b0d401eeddfe96bb7beda Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sun, 17 Aug 2014 08:14:15 -0400 Subject: [PATCH] tools-uclibc: accomodate new profile structure, bug #519686 --- tools-uclibc/portage.amd64.vanilla/profile/use.mask | 1 - tools-uclibc/portage.armv7a.vanilla/profile/use.mask | 1 - tools-uclibc/portage.i686.vanilla/profile/use.mask | 1 - tools-uclibc/portage.mips32r2.vanilla/profile/use.mask | 1 - tools-uclibc/portage.mipsel3.vanilla/profile/use.mask | 1 - tools-uclibc/portage.ppc.vanilla/profile/use.mask | 1 - tools-uclibc/run-armv7a.sh | 4 ++++ tools-uclibc/run-mips32r2.sh | 4 ++++ tools-uclibc/run-mipsel3.sh | 4 ++++ tools-uclibc/run-ppc.sh | 4 ++++ tools-uclibc/run.sh | 4 ++++ tools-uclibc/stage-all.conf.template | 2 +- 12 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 tools-uclibc/portage.amd64.vanilla/profile/use.mask delete mode 100644 tools-uclibc/portage.armv7a.vanilla/profile/use.mask delete mode 100644 tools-uclibc/portage.i686.vanilla/profile/use.mask delete mode 100644 tools-uclibc/portage.mips32r2.vanilla/profile/use.mask delete mode 100644 tools-uclibc/portage.mipsel3.vanilla/profile/use.mask delete mode 100644 tools-uclibc/portage.ppc.vanilla/profile/use.mask diff --git a/tools-uclibc/portage.amd64.vanilla/profile/use.mask b/tools-uclibc/portage.amd64.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.amd64.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/portage.armv7a.vanilla/profile/use.mask b/tools-uclibc/portage.armv7a.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.armv7a.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/portage.i686.vanilla/profile/use.mask b/tools-uclibc/portage.i686.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.i686.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/portage.mips32r2.vanilla/profile/use.mask b/tools-uclibc/portage.mips32r2.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.mips32r2.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/portage.mipsel3.vanilla/profile/use.mask b/tools-uclibc/portage.mipsel3.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.mipsel3.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/portage.ppc.vanilla/profile/use.mask b/tools-uclibc/portage.ppc.vanilla/profile/use.mask deleted file mode 100644 index cf56f2f6..00000000 --- a/tools-uclibc/portage.ppc.vanilla/profile/use.mask +++ /dev/null @@ -1 +0,0 @@ -hardened diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh index 13b684f4..0493fdb2 100755 --- a/tools-uclibc/run-armv7a.sh +++ b/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 diff --git a/tools-uclibc/run-mips32r2.sh b/tools-uclibc/run-mips32r2.sh index 3655549e..92cb31d2 100755 --- a/tools-uclibc/run-mips32r2.sh +++ b/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 diff --git a/tools-uclibc/run-mipsel3.sh b/tools-uclibc/run-mipsel3.sh index 4b70bed2..c0480f90 100755 --- a/tools-uclibc/run-mipsel3.sh +++ b/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 diff --git a/tools-uclibc/run-ppc.sh b/tools-uclibc/run-ppc.sh index 3fe44f44..c188f10e 100755 --- a/tools-uclibc/run-ppc.sh +++ b/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 diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh index ed0a14fc..ec06593e 100755 --- a/tools-uclibc/run.sh +++ b/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 diff --git a/tools-uclibc/stage-all.conf.template b/tools-uclibc/stage-all.conf.template index ad147a11..61878e6f 100644 --- a/tools-uclibc/stage-all.conf.template +++ b/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