[gentoo-commits] proj/releng:master commit in: tools-uclibc/, tools-uclibc/portage.arm.hardened/, ...

[Anthony G. Basile]

commit:     27b793508c41a60a851f9a333a632cb679505184
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 00:34:10 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 20 00:34:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=27b79350

tools-uclibc: improve template logic for armv7a

---
 .../env/coreutils.conf                             |    0
 .../env/git.conf                                   |    0
 .../package.accept_keywords                        |    0
 .../package.env                                    |    0
 .../package.mask                                   |    0
 .../package.use                                    |    0
 .../savedconfig/sys-apps/busybox-1.20.2            |    0
 .../savedconfig/sys-libs/uclibc-0.9.33.2-r3        |    0
 .../env/coreutils.conf                             |    0
 .../env/git.conf                                   |    0
 .../package.accept_keywords                        |    0
 .../package.env                                    |    0
 .../package.mask                                   |    0
 .../package.use                                    |    0
 .../profile/use.mask                               |    0
 .../savedconfig/sys-apps/busybox-1.20.2            |    0
 .../savedconfig/sys-libs/uclibc-0.9.33.2-r3        |    0
 tools-uclibc/run-armv7a.sh                         |   72 ++++++++++++-------
 .../stage1-armv7a-uclibc-hardened.conf.template    |    9 ---
 .../stage1-armv7a-uclibc-vanilla.conf.template     |    9 ---
 .../stage2-armv7a-uclibc-hardened.conf.template    |    9 ---
 .../stage2-armv7a-uclibc-vanilla.conf.template     |    9 ---
 .../stage3-armv7a-uclibc-hardened.conf.template    |    8 --
 .../stage3-armv7a-uclibc-vanilla.conf.template     |    8 --
 24 files changed, 45 insertions(+), 79 deletions(-)

diff --git a/tools-uclibc/portage.arm.hardened/env/coreutils.conf b/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/env/coreutils.conf
rename to tools-uclibc/portage.armv7a.hardened/env/coreutils.conf

diff --git a/tools-uclibc/portage.arm.hardened/env/git.conf b/tools-uclibc/portage.armv7a.hardened/env/git.conf
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/env/git.conf
rename to tools-uclibc/portage.armv7a.hardened/env/git.conf

diff --git a/tools-uclibc/portage.arm.hardened/package.accept_keywords b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/package.accept_keywords
rename to tools-uclibc/portage.armv7a.hardened/package.accept_keywords

diff --git a/tools-uclibc/portage.arm.hardened/package.env b/tools-uclibc/portage.armv7a.hardened/package.env
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/package.env
rename to tools-uclibc/portage.armv7a.hardened/package.env

diff --git a/tools-uclibc/portage.arm.hardened/package.mask b/tools-uclibc/portage.armv7a.hardened/package.mask
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/package.mask
rename to tools-uclibc/portage.armv7a.hardened/package.mask

diff --git a/tools-uclibc/portage.arm.hardened/package.use b/tools-uclibc/portage.armv7a.hardened/package.use
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/package.use
rename to tools-uclibc/portage.armv7a.hardened/package.use

diff --git a/tools-uclibc/portage.arm.hardened/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/savedconfig/sys-apps/busybox-1.20.2
rename to tools-uclibc/portage.armv7a.hardened/savedconfig/sys-apps/busybox-1.20.2

diff --git a/tools-uclibc/portage.arm.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3 b/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3
similarity index 100%
rename from tools-uclibc/portage.arm.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3
rename to tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3

diff --git a/tools-uclibc/portage.arm.vanilla/env/coreutils.conf b/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/env/coreutils.conf
rename to tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf

diff --git a/tools-uclibc/portage.arm.vanilla/env/git.conf b/tools-uclibc/portage.armv7a.vanilla/env/git.conf
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/env/git.conf
rename to tools-uclibc/portage.armv7a.vanilla/env/git.conf

diff --git a/tools-uclibc/portage.arm.vanilla/package.accept_keywords b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/package.accept_keywords
rename to tools-uclibc/portage.armv7a.vanilla/package.accept_keywords

diff --git a/tools-uclibc/portage.arm.vanilla/package.env b/tools-uclibc/portage.armv7a.vanilla/package.env
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/package.env
rename to tools-uclibc/portage.armv7a.vanilla/package.env

diff --git a/tools-uclibc/portage.arm.vanilla/package.mask b/tools-uclibc/portage.armv7a.vanilla/package.mask
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/package.mask
rename to tools-uclibc/portage.armv7a.vanilla/package.mask

diff --git a/tools-uclibc/portage.arm.vanilla/package.use b/tools-uclibc/portage.armv7a.vanilla/package.use
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/package.use
rename to tools-uclibc/portage.armv7a.vanilla/package.use

diff --git a/tools-uclibc/portage.arm.vanilla/profile/use.mask b/tools-uclibc/portage.armv7a.vanilla/profile/use.mask
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/profile/use.mask
rename to tools-uclibc/portage.armv7a.vanilla/profile/use.mask

diff --git a/tools-uclibc/portage.arm.vanilla/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/savedconfig/sys-apps/busybox-1.20.2
rename to tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-apps/busybox-1.20.2

diff --git a/tools-uclibc/portage.arm.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3 b/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3
similarity index 100%
rename from tools-uclibc/portage.arm.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3
rename to tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3

diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh
index 8f4a730..e61ea7f 100755
--- a/tools-uclibc/run-armv7a.sh
+++ b/tools-uclibc/run-armv7a.sh
@@ -16,10 +16,28 @@ prepare_confs() {
   local flavor=$2
 
   for s in 1 2 3; do
-    cat stage${s}-${arch}-uclibc-${flavor}.conf.template | \
+
+    local cstage=stage${s}
+    local p=$(( s - 1 ))
+    [[ $p == 0 ]] && p=3
+    local pstage=stage${p}
+    local tarch="${arch%32r2}"
+    local parch="arm/${tarch}"
+
+    cat stage-all.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-        -e "s:MyCatalyst:$(pwd):" >  stage${s}-${arch}-uclibc-${flavor}.conf
+        -e "s:CSTAGE:${cstage}:g" \
+        -e "s:PSTAGE:${pstage}:g" \
+        -e "s:SARCH:${arch}:g" \
+        -e "s:PARCH:${parch}:g" \
+        -e "s:TARCH:${tarch}:g" \
+        -e "s:gentoo-linux-uclibc:softfp-linux-uclibceabi:" \
+        -e "s:FLAVOR:${flavor}:g" \
+        -e "s:MYCATALYST:$(pwd):g" \
+        >  stage${s}-${arch}-uclibc-${flavor}.conf
   done
+
+  sed -i "/^chost/d" stage3-${arch}-uclibc-${flavor}.conf
 }
 
 banner() {
@@ -91,15 +109,15 @@ do_stages() {
 main() {
   local pretend=$1
 
-  >zzz.log
+#  >zzz.log
 
-  if [[ "x${pretend}" != "xtest" ]]; then
-     catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
-  else
-     >snapshot.log
-     >snapshot.err
-     echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err"
-  fi
+#  if [[ "x${pretend}" != "xtest" ]]; then
+#     catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+#  else
+#     >snapshot.log
+#     >snapshot.err
+#     echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err"
+#  fi
 
   for arch in armv7a; do
     for flavor in hardened vanilla; do
@@ -107,23 +125,23 @@ main() {
     done
   done
   
-  for arch in armv7a; do
-    for flavor in hardened vanilla; do
-      do_stages ${arch} ${flavor} ${pretend}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log
-         return 1
-      fi
-    done
-  done
-
-  if [[ "x${pretend}" == "xtest" ]]; then
-    tree /var/tmp/catalyst/builds
-    echo
-    echo "!!! Run fixup.sh to clean up!"
-    echo
-  fi
+#  for arch in armv7a; do
+#    for flavor in hardened vanilla; do
+#      do_stages ${arch} ${flavor} ${pretend}
+#      ret=$?
+#      if [[ $? == 1 ]]; then
+#         echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log
+#         return 1
+#      fi
+#    done
+#  done
+
+#  if [[ "x${pretend}" == "xtest" ]]; then
+#    tree /var/tmp/catalyst/builds
+#    echo
+#    echo "!!! Run fixup.sh to clean up!"
+#    echo
+#  fi
 }
 
 main $1 &

diff --git a/tools-uclibc/stage1-armv7a-uclibc-hardened.conf.template b/tools-uclibc/stage1-armv7a-uclibc-hardened.conf.template
deleted file mode 100644
index 78f6d9c..0000000
--- a/tools-uclibc/stage1-armv7a-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: armv7a
-target: stage1
-version_stamp: uclibc-hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage3-armv7a-uclibc-hardened
-chost: armv7a-softfp-linux-uclibceabi
-portage_confdir: MyCatalyst/portage.arm.hardened

diff --git a/tools-uclibc/stage1-armv7a-uclibc-vanilla.conf.template b/tools-uclibc/stage1-armv7a-uclibc-vanilla.conf.template
deleted file mode 100644
index d523a21..0000000
--- a/tools-uclibc/stage1-armv7a-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: armv7a
-target: stage1
-version_stamp: uclibc-vanilla
-rel_type: vanilla/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: vanilla/armv7a/stage3-armv7a-uclibc-vanilla
-chost: armv7a-softfp-linux-uclibceabi
-portage_confdir: MyCatalyst/portage.arm.vanilla

diff --git a/tools-uclibc/stage2-armv7a-uclibc-hardened.conf.template b/tools-uclibc/stage2-armv7a-uclibc-hardened.conf.template
deleted file mode 100644
index 251739b..0000000
--- a/tools-uclibc/stage2-armv7a-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: armv7a
-target: stage2
-version_stamp: uclibc-hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage1-armv7a-uclibc-hardened
-chost: armv7a-softfp-linux-uclibceabi
-portage_confdir: MyCatalyst/portage.arm.hardened

diff --git a/tools-uclibc/stage2-armv7a-uclibc-vanilla.conf.template b/tools-uclibc/stage2-armv7a-uclibc-vanilla.conf.template
deleted file mode 100644
index 38a05bd..0000000
--- a/tools-uclibc/stage2-armv7a-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: armv7a
-target: stage2
-version_stamp: uclibc-vanilla
-rel_type: vanilla/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: vanilla/armv7a/stage1-armv7a-uclibc-vanilla
-chost: armv7a-softfp-linux-uclibceabi
-portage_confdir: MyCatalyst/portage.arm.vanilla

diff --git a/tools-uclibc/stage3-armv7a-uclibc-hardened.conf.template b/tools-uclibc/stage3-armv7a-uclibc-hardened.conf.template
deleted file mode 100644
index 49f8e58..0000000
--- a/tools-uclibc/stage3-armv7a-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: armv7a
-target: stage3
-version_stamp: uclibc-hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage2-armv7a-uclibc-hardened
-portage_confdir: MyCatalyst/portage.arm.hardened

diff --git a/tools-uclibc/stage3-armv7a-uclibc-vanilla.conf.template b/tools-uclibc/stage3-armv7a-uclibc-vanilla.conf.template
deleted file mode 100644
index 3c4f12b..0000000
--- a/tools-uclibc/stage3-armv7a-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: armv7a
-target: stage3
-version_stamp: uclibc-vanilla
-rel_type: vanilla/armv7a
-profile: hardened/linux/uclibc/arm/armv7a
-snapshot: current
-source_subpath: vanilla/armv7a/stage2-armv7a-uclibc-vanilla
-portage_confdir: MyCatalyst/portage.arm.vanilla