Merge branches

grml · Oct 17, 2007 · 0edfd58 · 0edfd58
2 parents fd6a797 + a090ad8
commit 0edfd58
Show file tree

Hide file tree

Showing 16 changed files with 260 additions and 507 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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