Update of buildd scripts

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 79c1223..0a1e620 100755 (executable)
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Oct  7 09:29:22 UTC 2007 [mika]
+# Latest change: Don Okt 18 00:32:36 CEST 2007 [mika]
 ################################################################################
 
 set -e
@@ -36,7 +36,7 @@ done
 
 # inform on successful removal:
 if [ "$(echo "$REMOVE_ME" | tr -d ' ' )" != "" ] ; then
-   echo "deleted files $REMOVE_ME" | mail -s "daily-builds cleanup script" mika@grml.org
+   echo "deleted files $REMOVE_ME" | mail -s "daily-builds cleanup script" root@localhost
 fi
 
-# EOF
+## END OF FILE #################################################################

diff --git a/buildd/grml-live_autobuild_grml-large_etch.sh b/buildd/grml-live_autobuild_grml-large_etch.sh
index dcf67ac..4dfb6a6 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml-large_etch.sh
@@ -1,49 +1,24 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml_etch_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=etch
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
 # execute grml-live:
-grml-live -F -s etch -c GRMLBASE,GRML_FULL,LATEX_CLEANUP,I386 -o $OUTPUT_DIR \
-          -g grml -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-large_etch.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-large_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml-large_sid.sh b/buildd/grml-live_autobuild_grml-large_sid.sh
index 3aa1c60..3f90135 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml-large_sid.sh
@@ -1,49 +1,24 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml_sid_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=sid
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,GRML_FULL,LATEX_CLEANUP,I386 -o $OUTPUT_DIR \
-          -g grml -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-large_sid.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-large_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml-medium_etch.sh b/buildd/grml-live_autobuild_grml-medium_etch.sh
index 7988462..d4686ab 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml-medium_etch.sh
@@ -1,49 +1,27 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
-ISO_NAME=grml-medium_etch_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
 
-# execute grml-live:
-grml-live -F -s etch -c GRMLBASE,I386,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml-medium -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
+#!/bin/sh
 
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
+. main.sh || exit 1
 
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
+# settings for grml_live_run:
+ISO_NAME=grml-medium_etch_$DATE.iso
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_etch.sh
+# execute grml-live:
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-medium_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml-medium_sid.sh b/buildd/grml-live_autobuild_grml-medium_sid.sh
index bc34009..6f0b709 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml-medium_sid.sh
@@ -1,49 +1,24 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml-medium_sid_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,i386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,I386,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml-medium -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_sid.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-medium_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml-small_etch.sh b/buildd/grml-live_autobuild_grml-small_etch.sh
index 7775e06..304c3c2 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml-small_etch.sh
@@ -1,49 +1,24 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml-small_etch_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=etch
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
 # execute grml-live:
-grml-live -F -s etch -c GRMLBASE,I386,GRML_SMALL,REMOVE_DOCS -o $OUTPUT_DIR \
-          -g grml-small -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-small_etch.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-small_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh
index 1f4d0dc..daaa9e8 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml-small_sid.sh
@@ -1,49 +1,25 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
+# settings for grml_live_run:
 DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
 ISO_NAME=grml-small_sid_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
-
-# execute grml-live:
-grml-live -F -s sid -c GRMLBASE,I386,GRML_SMALL,REMOVE_DOCS -o $OUTPUT_DIR \
-          -g grml-small -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
+SUITE=sid
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
+. main.sh || exit 1
 
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-small_sid.sh
+# execute grml-live:
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-small_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-large_etch.sh b/buildd/grml-live_autobuild_grml64-large_etch.sh
index cfa6360..062a2e2 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-large_etch.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64_etch_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=etch
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,AMD64'
+NAME=grml64
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s etch -c GRMLBASE,GRML_FULL,LATEX_CLEANUP,AMD64 -o $OUTPUT_DIR \
-          -g grml64 -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-large_etch.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-large_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-large_sid.sh b/buildd/grml-live_autobuild_grml64-large_sid.sh
index c456bdf..0eef2c4 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-large_sid.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64_sid_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=sid
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,AMD64'
+NAME=grml64
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,GRML_FULL,LATEX_CLEANUP,AMD64 -o $OUTPUT_DIR \
-          -g grml64 -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-large_sid.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-large_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-medium_etch.sh b/buildd/grml-live_autobuild_grml64-medium_etch.sh
index b314d19..89284e4 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_etch.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64-medium_etch_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=etch
+CLASSES='GRMLBASE,GRML_MEDIUM,AMD64'
+NAME=grml64-medium
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s etch -c GRMLBASE,AMD64,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml64-medium -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_etch.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-medium_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-medium_sid.sh b/buildd/grml-live_autobuild_grml64-medium_sid.sh
index 9b52921..e45eeb5 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_sid.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64-medium_sid_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,AMD64'
+NAME=grml64-medium
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,AMD64,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml64-medium -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_sid.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-medium_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-small_etch.sh b/buildd/grml-live_autobuild_grml64-small_etch.sh
index 91e06e8..d7bc0b1 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-small_etch.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64-small_etch_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=etch
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,AMD64'
+NAME=grml64-small
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s etch -c GRMLBASE,AMD64,GRML_SMALL,REMOVE_DOCS -o $OUTPUT_DIR \
-          -g grml64-small -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-small_etch.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-small_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh
index 77675c8..1e651a4 100755 (executable)
--- a/buildd/grml-live_autobuild_grml64-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-small_sid.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64-small_sid_$DATE.iso
-ISO_DIR=/grml-live/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
+SUITE=sid
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,AMD64'
+NAME=grml64-small
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,AMD64,GRML_SMALL,REMOVE_DOCS -o $OUTPUT_DIR \
-          -g grml64-small -v $DATE -r grml-live-autobuild -i $ISO_NAME \
-         1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-small_sid.sh
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml64-small_sid.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout

diff --git a/buildd/main.sh b/buildd/main.sh
new file mode 100755 (executable)
index 0000000..c76e099
--- /dev/null
+++ b/buildd/main.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+# Filename:      main.sh
+# Purpose:       main configuration and function file for grml-live buildd
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+# Latest change: Don Okt 18 00:32:02 CEST 2007 [mika]
+################################################################################
+
+# configuration:
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
+DATE=$(date +%Y%m%d)
+STORAGE=/grml-live/
+OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
+TMP_DIR=$(mktemp -d)
+MUTT_HEADERS=$(mktemp)
+ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
+[ -n "$ARCH" ] && GRML_LIVE_ARCH="-a $ARCH"
+[ -n "$TMP_DIR" ] || exit 10
+[ -n "$MUTT_HEADERS" ] || exit 20
+RECIPIENT=root@localhost
+ISO_DIR=/grml-live/grml-isos
+echo "my_hdr From: grml-live autobuild daemon <root@localhost>" > $MUTT_HEADERS
+
+# execute grml-live:
+grml_live_run() {
+grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+          -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
+         1>/var/log/fai/dirinstall/grml/grml-live.stdout \
+         2>/var/log/fai/dirinstall/grml/grml-live.stderr ; RC=$?
+
+if [ "$RC" = "0" ] ; then
+   RC=success
+else
+   RC=error
+fi
+}
+
+create_logs() {
+# create log archive:
+tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
+}
+
+iso_details() {
+if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
+   ISO_DETAILS="There was an error creating $ISO_NAME"
+else
+   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
+fi
+}
+
+send_mail() {
+# send status mail:
+echo -en "Automatically generated mail by $SCRIPTNAME
+
+$ISO_DETAILS
+
+Return code of grml-live run was: $RC
+
+The following errors have been noticed (several might be warnings only):
+
+$(grep error /var/log/fai/dirinstall/grml/* | grep -ve liberror -ve libgpg-error)
+
+The following warnings have been noticed:
+
+$(grep warn /var/log/fai/dirinstall/grml/*)
+
+Find details in the attached logs." | \
+mutt -s "grml-live_autobuild_grml-large_sid.sh [${DATE}] - $RC" \
+     -a $ATTACHMENT \
+     $RECIPIENT
+}
+
+store_iso() {
+# make sure we store the final iso:
+[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
+mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+}
+
+bailout() {
+  rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+}
+
+trap bailout 1 2 3 15
+
+## END OF FILE #################################################################

diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 17b5f67..9f709dd 100755 (executable)
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -1,19 +1,10 @@
 #!/bin/sh
-# Filename:      upload_isos.sh
-# Purpose:       upload generated ISOs to daily.grml.org
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mit Okt 10 09:46:08 CEST 2007 [mika]
-################################################################################
-
-cd /grml-live/grml-isos || exit 1
+. main.sh || exit 1
+umask 002
+cd /srv/grml-isos || exit 1
 for file in *.iso ; do
-    [ -f "${file}.md5" ] || md5sum $file > $file.md5
+    [ -f "${file}.md5" ] || md5sum $file > ${file}.md5
     chmod 664 $file
     chmod 664 ${file}.md5
 done
-umask 002
-rsync --partial -az --quiet /grml-live/grml-isos/* grml-build@debian.netcologne.de:/home/ftp/www.grml.org/daily/
-
-## END OF FILE #################################################################
+rsync --partial -az --quiet $ISO_DIR/* grml-build@debian.netcologne.de:/home/ftp/www.grml.org/daily/

diff --git a/debian/changelog b/debian/changelog
index ae7fdec..1d19b11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ grml-live (0.0.6) unstable; urgency=low
     grml(32) on amd64.
   * Fix stderr redirection in "/usr/sbin/fai already running..."
   * Update /etc/grml/fai/make-fai-nfsroot.conf
+  * Update of buildd scripts: main configuration file main.sh
+    which provides all the build stuff inside separate functions.
 
  -- Michael Prokop <mika@grml.org>  Wed, 17 Oct 2007 22:59:08 +0200