From 6decb9b013be4c016fa61afbf86655c8b7afc734 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Sun, 9 Dec 2007 18:41:49 +0100
Subject: [PATCH] Do not install package 'grml' via GRMLBASE; generate md5sum
 of ISO; update buildd/

---
 buildd/functions.sh                              | 19 ++++++++++++----
 buildd/grml-live_autobuild_grml-large_etch.sh    |  1 +
 buildd/grml-live_autobuild_grml-large_sid.sh     |  1 +
 buildd/grml-live_autobuild_grml-medium_etch.sh   |  1 +
 buildd/grml-live_autobuild_grml-medium_sid.sh    |  1 +
 buildd/grml-live_autobuild_grml-small_etch.sh    |  1 +
 buildd/grml-live_autobuild_grml-small_sid.sh     |  1 +
 buildd/grml-live_autobuild_grml64-large_etch.sh  |  1 +
 buildd/grml-live_autobuild_grml64-large_sid.sh   |  1 +
 buildd/grml-live_autobuild_grml64-medium_etch.sh |  1 +
 buildd/grml-live_autobuild_grml64-medium_sid.sh  |  1 +
 buildd/grml-live_autobuild_grml64-small_etch.sh  |  1 +
 buildd/grml-live_autobuild_grml64-small_sid.sh   |  1 +
 buildd/upload_isos.sh                            |  5 ++--
 debian/changelog                                 |  7 ++++--
 etc/grml/fai/config/package_config/GRMLBASE      |  1 -
 grml-live                                        | 29 +++++++++++++++++-------
 17 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 7b979bc..08d2661 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.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: Die Okt 30 09:47:34 CET 2007 [mika]
+# Latest change: Sun Dec 09 18:38:26 CET 2007 [mika]
 ################################################################################
 
 die() {
@@ -75,6 +75,14 @@ create_logs() {
   ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES $GRML_LOGFILE 1>/dev/null )
 }
 
+# store logs on remote server:
+upload_logs() {
+  [ -n "$RSYNC_MIRROR" ] || return 1
+#  eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log)
+  rsync --times --partial -az --quiet /var/log/grml-buildd.* \
+  $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
+}
+
 # store information of ISO size:
 iso_details() {
   if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
@@ -86,6 +94,9 @@ iso_details() {
 
 # send status mail:
 send_mail() {
+  # attach logs only if we have some:
+  [ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH=''
+
   echo -en "Automatically generated mail by $SCRIPTNAME
 
 $ISO_DETAILS
@@ -110,10 +121,8 @@ The following packages could not be installed:
 
 $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
 
-Find details in the attached logs." | \
-  mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
-       -a $ATTACHMENT \
-       $RECIPIENT
+EOF " | \
+  mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" $MUTT_ATTACH "$RECIPIENT"
 }
 
 # make sure we store the final iso:
diff --git a/buildd/grml-live_autobuild_grml-large_etch.sh b/buildd/grml-live_autobuild_grml-large_etch.sh
index bf81709..f4b7362 100755
--- a/buildd/grml-live_autobuild_grml-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml-large_etch.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml-large_sid.sh b/buildd/grml-live_autobuild_grml-large_sid.sh
index 94863d0..67a6de0 100755
--- a/buildd/grml-live_autobuild_grml-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml-large_sid.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml-medium_etch.sh b/buildd/grml-live_autobuild_grml-medium_etch.sh
index 772816e..8db8a7e 100755
--- a/buildd/grml-live_autobuild_grml-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml-medium_etch.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml-medium_sid.sh b/buildd/grml-live_autobuild_grml-medium_sid.sh
index 27bff66..aaf2eed 100755
--- a/buildd/grml-live_autobuild_grml-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml-medium_sid.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml-small_etch.sh b/buildd/grml-live_autobuild_grml-small_etch.sh
index 5d967f2..a727c51 100755
--- a/buildd/grml-live_autobuild_grml-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml-small_etch.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh
index 08783fc..5609a5e 100755
--- a/buildd/grml-live_autobuild_grml-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml-small_sid.sh
@@ -15,6 +15,7 @@ ARCH=i386
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-large_etch.sh b/buildd/grml-live_autobuild_grml64-large_etch.sh
index 98c185d..30d961b 100755
--- a/buildd/grml-live_autobuild_grml64-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-large_etch.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-large_sid.sh b/buildd/grml-live_autobuild_grml64-large_sid.sh
index 5467a29..c5cf4a2 100755
--- a/buildd/grml-live_autobuild_grml64-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-large_sid.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-medium_etch.sh b/buildd/grml-live_autobuild_grml64-medium_etch.sh
index 132651f..e97ec47 100755
--- a/buildd/grml-live_autobuild_grml64-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_etch.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-medium_sid.sh b/buildd/grml-live_autobuild_grml64-medium_sid.sh
index 0844239..7a42a72 100755
--- a/buildd/grml-live_autobuild_grml64-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_sid.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-small_etch.sh b/buildd/grml-live_autobuild_grml64-small_etch.sh
index 9edb820..5335901 100755
--- a/buildd/grml-live_autobuild_grml64-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-small_etch.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh
index 3c87def..1c5def9 100755
--- a/buildd/grml-live_autobuild_grml64-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-small_sid.sh
@@ -15,6 +15,7 @@ ARCH=amd64
 grml_live_run
 
 create_logs
+# upload_logs
 
 iso_details
 
diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 25d3453..8b5462d 100755
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.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: Mon Oct 22 19:50:36 CEST 2007 [mika]
+# Latest change: Sun Dec 09 18:10:08 CET 2007 [mika]
 ################################################################################
 
 . /etc/grml/grml-buildd.conf || exit 1
@@ -19,6 +19,7 @@ for file in *.iso ; do
     chmod 664 "$file"
     chmod 664 "${file}".md5
 done
-rsync --partial -az --quiet $ISO_DIR/* $RSYNC_MIRROR
+
+rsync --times --partial -az --quiet $ISO_DIR/* $RSYNC_MIRROR
 
 ## END OF FILE #################################################################
diff --git a/debian/changelog b/debian/changelog
index b78f5b6..e915013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ grml-live (0.0.12) unstable; urgency=low
     does not exist yet.
   * Update buildd/cleanup.sh and add buildd/files/.logo.png, 
     buildd/files/.style.css, buildd/files/HEADER.html and
-    buildd/link_latest.sh (create symlinks for latest snapshot ISOs).
-
+    buildd/link_latest.sh (create symlinks for latest snapshot ISOs)
+    and provide upload_logs().
+  * Generate md5sum of ISO if using class 'RELEASE'.
+  * Do not install package 'grml' via GRMLBASE because we want
+    to use grml-small in GRML_SMALL and GRML_MEDIUM.
 
  -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 17:28:01 +0100
 
diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index ecce0d5..62b923c 100644
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -11,7 +11,6 @@ debconf-utils
 deborphan
 eject
 file
-grml
 grml2hd
 grml2hd-utils
 grml2usb
diff --git a/grml-live b/grml-live
index 9692c97..d402757 100755
--- a/grml-live
+++ b/grml-live
@@ -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 Dec 09 17:53:23 CET 2007 [mika]
+# Latest change: Sun Dec 09 18:18:27 CET 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -563,14 +563,27 @@ if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" ] ; then
    ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0
 else
    mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'"
+
    CURRENT_DIR=$(pwd)
-   cd "$BUILD_OUTPUT" &&
-   log "mkisofs -V grml '$VERSION' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
-   mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \
-           -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table    \
-           -b $BOOT_FILE \
-           -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
-   cd $CURRENT_DIR
+   if cd "$BUILD_OUTPUT" ; then
+      log "mkisofs -V grml '$VERSION' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
+      mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \
+              -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table    \
+              -b $BOOT_FILE \
+              -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
+
+      # generate md5sum of ISO if we are using class 'RELEASE':
+      case $CLASSES in *RELEASES*)
+         [ "$RC" = 0 ] && \
+         ( cd $ISO_OUTPUT && \
+         md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \
+         touch -r ${ISO_NAME} ${ISO_NAME}.md5 )
+         ;;
+      esac
+
+      cd $CURRENT_DIR
+   fi
+
    if [ "$RC" = 0 ] ; then
       log "Finished execution of stage 'iso build' [$(date)]"
       einfo "Finished execution of stage 'iso build'" ; eend 0
-- 
2.1.4