From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.i686.vanilla/profile/, ...
Date: Sun, 17 Aug 2014 12:12:16 +0000 (UTC) [thread overview]
Message-ID: <1408277655.2d9492ca73866956881b0d401eeddfe96bb7beda.blueness@gentoo> (raw)
commit: 2d9492ca73866956881b0d401eeddfe96bb7beda
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 17 12:14:15 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 12:14:15 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=2d9492ca
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(-)
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 cf56f2f..0000000
--- 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 cf56f2f..0000000
--- 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 cf56f2f..0000000
--- 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 cf56f2f..0000000
--- 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 cf56f2f..0000000
--- 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 cf56f2f..0000000
--- 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 13b684f..0493fdb 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 3655549..92cb31d 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 4b70bed..c0480f9 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 3fe44f4..c188f10 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 ed0a14f..ec06593 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 ad147a1..61878e6 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
reply other threads:[~2014-08-17 12:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408277655.2d9492ca73866956881b0d401eeddfe96bb7beda.blueness@gentoo \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox