tools-uclibc: improve template logic for armv7a

2013-05-19 20:34:10 -04:00 · 2013-05-19 20:34:10 -04:00 · d26cab393a
parent 29dff6b837
commit d26cab393a
24 changed files with 20 additions and 54 deletions
--- a/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf
+++ b/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf
--- a/tools-uclibc/portage.armv7a.hardened/env/git.conf
+++ b/tools-uclibc/portage.armv7a.hardened/env/git.conf
--- a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords
+++ b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords
--- a/tools-uclibc/portage.armv7a.hardened/package.env
+++ b/tools-uclibc/portage.armv7a.hardened/package.env
--- a/tools-uclibc/portage.armv7a.hardened/package.mask
+++ b/tools-uclibc/portage.armv7a.hardened/package.mask
--- a/tools-uclibc/portage.armv7a.hardened/package.use
+++ b/tools-uclibc/portage.armv7a.hardened/package.use
--- a/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-apps/busybox-1.20.2
+++ b/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-apps/busybox-1.20.2
--- a/tools-uclibc/portage.armv7a.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
--- a/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf
+++ b/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf
--- a/tools-uclibc/portage.armv7a.vanilla/env/git.conf
+++ b/tools-uclibc/portage.armv7a.vanilla/env/git.conf
--- a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords
+++ b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords
--- a/tools-uclibc/portage.armv7a.vanilla/package.env
+++ b/tools-uclibc/portage.armv7a.vanilla/package.env
--- a/tools-uclibc/portage.armv7a.vanilla/package.mask
+++ b/tools-uclibc/portage.armv7a.vanilla/package.mask
--- a/tools-uclibc/portage.armv7a.vanilla/package.use
+++ b/tools-uclibc/portage.armv7a.vanilla/package.use
--- a/tools-uclibc/portage.armv7a.vanilla/profile/use.mask
+++ b/tools-uclibc/portage.armv7a.vanilla/profile/use.mask
--- a/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-apps/busybox-1.20.2
+++ b/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-apps/busybox-1.20.2
--- a/tools-uclibc/portage.armv7a.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
--- 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() {
--- a/tools-uclibc/stage1-armv7a-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage1-armv7a-uclibc-hardened.conf.template
@ -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
--- a/tools-uclibc/stage1-armv7a-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage1-armv7a-uclibc-vanilla.conf.template
@ -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
--- a/tools-uclibc/stage2-armv7a-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage2-armv7a-uclibc-hardened.conf.template
@ -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
--- a/tools-uclibc/stage2-armv7a-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage2-armv7a-uclibc-vanilla.conf.template
@ -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
--- a/tools-uclibc/stage3-armv7a-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage3-armv7a-uclibc-hardened.conf.template
@ -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
--- a/tools-uclibc/stage3-armv7a-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage3-armv7a-uclibc-vanilla.conf.template
@ -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