[gentoo-commits] proj/releng:master commit in: tools/

[Mike Frysinger]

commit:     a85f4327c67f66501a4332d1a1a1617f3a26ec3b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:21:05 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 05:21:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=a85f4327

catalyst-auto: unify catalyst.conf parsing

 tools/catalyst-auto                    | 9 +++++++++
 tools/catalyst-auto-alpha.conf         | 4 ----
 tools/catalyst-auto-armv4tl.conf       | 4 ----
 tools/catalyst-auto-armv5tel.conf      | 4 ----
 tools/catalyst-auto-armv6j.conf        | 4 ----
 tools/catalyst-auto-armv6j_hardfp.conf | 4 ----
 tools/catalyst-auto-armv7a.conf        | 4 ----
 tools/catalyst-auto-armv7a_hardfp.conf | 4 ----
 tools/catalyst-auto-hppa.conf          | 4 ----
 tools/catalyst-auto-ia64.conf          | 4 ----
 tools/catalyst-auto-ppc.conf           | 4 ----
 tools/catalyst-auto-ppc64.conf         | 4 ----
 tools/catalyst-auto-s390.conf          | 4 ----
 tools/catalyst-auto-s390x.conf         | 4 ----
 tools/catalyst-auto-sparc64.conf       | 4 ----
 15 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3d0b419..70755d5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -17,6 +17,8 @@ if [[ -z ${UNSHARE} ]] ; then
 fi
 unset UNSHARE
 
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
 declare -a config_files
 config_files=()
 verbose=0
@@ -87,6 +89,12 @@ post_build() {
   local foo=bar
 }
 
+catalyst_var() {
+  # Extract a setting from the catalyst.conf.
+  local var=$1
+  (. "${CATALYST_CONFIG}"; echo "${!var}")
+}
+
 # Parse args
 params=${#}
 while [ ${#} -gt 0 ]
@@ -136,6 +144,7 @@ if [[ $doneconfig -eq 0 ]]; then
       exit 1
 fi
 
+BUILD_SRCDIR_BASE=$(catalyst_var storedir)
 
 TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
 DATESTAMP=$(date +%Y%m%d)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5a698cf..5035345 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -19,10 +19,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=armi...@gentoo.org
 EMAIL_SUBJECT_PREPEND="[alpha-auto]"
  
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
- 
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index e5328d2..410b61d 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv5tel.conf 
b/tools/catalyst-auto-armv5tel.conf
index ebcf494..0acc94f 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0dc8ffa..019dab1 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv6j_hardfp.conf 
b/tools/catalyst-auto-armv6j_hardfp.conf
index cfb669f..1ab7569 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index a1e6689..462ae68 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-armv7a_hardfp.conf 
b/tools/catalyst-auto-armv7a_hardfp.conf
index f2b5aa0..bdb0114 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 17bab7a..77939d0 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -19,10 +19,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=catal...@hake.hppa.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[hppa-auto]"
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 684c60c..b065af2 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -16,10 +16,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=catal...@guppy.ia64.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[ia64-auto]"
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 44ecae7..a65e21b 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -16,10 +16,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=catal...@timberdoodle.ppc64.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[ppc-auto]"
  
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index b726e7e..4600771 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -17,10 +17,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=catal...@timberdoodle.ppc64.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
  
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
- 
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 9f59c2b..6301ee1 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 13ba079..ce22af9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 4d56b0f..5a8ab0c 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -16,10 +16,6 @@ 
EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
 EMAIL_FROM=catal...@bender.sparc.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
 
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 
's/"//g'`
-
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
   sort -k +1 -n -t '~' |\