commit: 08a69c4392ff7b85bf02675d074d73348810af24
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 05:31:30 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:31:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=08a69c43
catalyst-auto: move default email settings to main script
tools/catalyst-auto | 6 ++++++
tools/catalyst-auto-alpha.conf | 7 -------
tools/catalyst-auto-armv4tl.conf | 2 --
tools/catalyst-auto-armv5tel.conf | 2 --
tools/catalyst-auto-armv6j.conf | 2 --
tools/catalyst-auto-armv6j_hardfp.conf | 2 --
tools/catalyst-auto-armv7a.conf | 2 --
tools/catalyst-auto-armv7a_hardfp.conf | 2 --
tools/catalyst-auto-hppa.conf | 2 --
tools/catalyst-auto-ia64.conf | 3 ---
tools/catalyst-auto-ppc.conf | 2 --
tools/catalyst-auto-ppc64.conf | 2 --
tools/catalyst-auto-s390.conf | 4 ----
tools/catalyst-auto-s390x.conf | 4 ----
tools/catalyst-auto-sparc64.conf | 2 --
15 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cc20505..00d8250 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -155,6 +155,12 @@ fi
# Probe the default gitdir from this script name.
GITDIR=$(dirname "$(dirname "$(realpath "$0")")")
+# Set up defaults that config files can override if they want.
+SUBARCH=$(uname -m)
+EMAIL_TO="rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org"
+EMAIL_FROM="catalyst@${HOSTNAME:-$(hostname)}"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
doneconfig=0
for config_file in ${config_files[@]}; do
# Make sure all required values were specified
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5035345..601f9ef 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/space/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/alpha
SPECS="stage1.spec stage2.spec stage3.spec"
@@ -14,11 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/alpha
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-#EMAIL_FROM=catal...@monolith.alpha.dev.gentoo.org
-EMAIL_FROM=armi...@gentoo.org
-EMAIL_SUBJECT_PREPEND="[alpha-auto]"
-
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 410b61d..f49b457 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv5tel.conf
b/tools/catalyst-auto-armv5tel.conf
index 0acc94f..b6a0924 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 019dab1..4048d84 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf
b/tools/catalyst-auto-armv6j_hardfp.conf
index 1ab7569..7a5ab2e 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 462ae68..0e67b76 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf
b/tools/catalyst-auto-armv7a_hardfp.conf
index bdb0114..2095001 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 77939d0..f87b60b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -15,8 +15,6 @@ SET_hppa_netboot_SPECS="netboot2-hppa32.spec
netboot2-hppa64.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/hppa
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catal...@hake.hppa.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b065af2..20c8820 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -12,9 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catal...@guppy.ia64.dev.gentoo.org
-EMAIL_SUBJECT_PREPEND="[ia64-auto]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a65e21b..6822ef0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -12,8 +12,6 @@ SPECS="stage1.spec stage2.spec stage3.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catal...@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 4600771..7a4a970 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -13,8 +13,6 @@ OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catal...@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 6301ee1..7e37997 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -12,10 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@$(hostname)
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index ce22af9..39047e7 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,10 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catalyst@$(hostname)
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 5a8ab0c..72ade0a 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -12,8 +12,6 @@ SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec
multilib/stage3.sp
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org
-EMAIL_FROM=catal...@bender.sparc.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
give_latest_from_dates() {
