buildd: add support for building squeeze based ISOs

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index f9e72b1..3d64346 100755 (executable)
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -19,14 +19,15 @@ cd $MIRROR_DIRECTORY || exit 2
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-small_lenny grml-small_sid grml-medium_lenny grml-medium_sid grml_sid grml_lenny \
-               grml64-small_lenny grml64-small_sid grml64-medium_lenny grml64-medium_sid grml64_sid grml64_lenny ; do
+for flavour in grml-medium_lenny   grml-medium_squeeze   grml-medium_sid   grml-small_lenny   grml-small_squeeze  grml-small_sid \
+               grml64-medium_lenny grml64-medium_squeeze grml64-medium_sid grml64-small_lenny grml64-small_squeeze grml64-small_sid \
+               grml64_lenny grml64_squeeze grml64_sid grml_lenny grml_squeeze grml_sid ; do
   FILE_COUNT=$(ls -1 $flavour/$flavour*.iso | wc -l)
   if [ "$FILE_COUNT" -gt "$DAYS" ] ; then
      FILES=$(ls -1 $flavour/$flavour*.iso | tail -"$DAYS")
      OLD_FILES=$(ls $flavour/$flavour*.iso | grep -v "$FILES")
      for file in $OLD_FILES ; do
-         REMOVE_ME="$REMOVE_ME $(find "$file" -mtime +$DAYS)"
+         REMOVE_ME="$REMOVE_ME $(find $file -mtime +$DAYS)"
      done
   fi
 done
@@ -34,11 +35,10 @@ done
 [ -d .archive ] || mkdir .archive
 
 for file in $REMOVE_ME ; do
-    # remove ISOs:
-    test -f "${file}"      && rm -f "$file"
+    test -f ${file}     && rm -f $file
     # ... but keep their md5sum / sha1sum:
-    test -f "${file}".md5  && mv "${file}".md5   .archive
-    test -f "${file}".sha1 && mv "${file}".sha1 .archive
+    test -f ${file}.md5  && mv ${file}.md5   .archive
+    test -f ${file}.sha1 && mv ${file}.sha1 .archive
 done
 
 # inform on successful removal:

diff --git a/buildd/grml-live_autobuild_grml-large_squeeze.sh b/buildd/grml-live_autobuild_grml-large_squeeze.sh
new file mode 100755 (executable)
index 0000000..f939483
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml-large_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386'
+NAME=grml
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/grml-live_autobuild_grml-medium_squeeze.sh b/buildd/grml-live_autobuild_grml-medium_squeeze.sh
new file mode 100755 (executable)
index 0000000..dbe4b06
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml-medium_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml-medium_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386'
+NAME=grml-medium
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/grml-live_autobuild_grml-small_squeeze.sh b/buildd/grml-live_autobuild_grml-small_squeeze.sh
new file mode 100755 (executable)
index 0000000..b4c3fb2
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml-small_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml-small_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,I386'
+NAME=grml-small
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/grml-live_autobuild_grml64-large_squeeze.sh b/buildd/grml-live_autobuild_grml64-large_squeeze.sh
new file mode 100755 (executable)
index 0000000..d18c389
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml64-large_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml64_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,AMD64'
+NAME=grml64
+SCRIPTNAME="$(basename $0)"
+ARCH=amd64
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/grml-live_autobuild_grml64-medium_squeeze.sh b/buildd/grml-live_autobuild_grml64-medium_squeeze.sh
new file mode 100755 (executable)
index 0000000..55a6ef3
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml64-medium_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml64-medium_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,AMD64'
+NAME=grml64-medium
+SCRIPTNAME="$(basename $0)"
+ARCH=amd64
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/grml-live_autobuild_grml64-small_squeeze.sh b/buildd/grml-live_autobuild_grml64-small_squeeze.sh
new file mode 100755 (executable)
index 0000000..feba100
--- /dev/null
+++ b/buildd/grml-live_autobuild_grml64-small_squeeze.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# settings for grml_live_run:
+DATE=$(date +%Y%m%d)
+ISO_NAME=grml64-small_squeeze_$DATE.iso
+SUITE=squeeze
+CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,AMD64'
+NAME=grml64-small
+SCRIPTNAME="$(basename $0)"
+ARCH=amd64
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1

diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh
index a262e12..8bb1943 100755 (executable)
--- a/buildd/link_latest.sh
+++ b/buildd/link_latest.sh
@@ -13,8 +13,11 @@ set -e
 [ -n "$MIRROR_DIRECTORY" ] || exit 1
 cd $MIRROR_DIRECTORY || exit 2
 
-for flavour in grml-small_lenny grml-small_sid grml-medium_lenny grml-medium_sid grml_sid grml_lenny \
-               grml64-small_lenny grml64-small_sid grml64-medium_lenny grml64-medium_sid grml64_sid grml64_lenny ; do
+cd "$DAILY_DIR"
+echo "---------------------------" >> "$DAILY_DIR"/.timestamp_link
+for flavour in grml-medium_lenny   grml-medium_squeeze   grml-medium_sid   grml-small_lenny   grml-small_squeeze  grml-small_sid \
+               grml64-medium_lenny grml64-medium_squeeze grml64-medium_sid grml64-small_lenny grml64-small_squeeze grml64-small_sid \
+               grml64_lenny grml64_squeeze grml64_sid grml_lenny grml_squeeze grml_sid ; do
   ISO="$(ls -1 $flavour/*.iso | tail -1)"
   if [ -n "$ISO" ] ; then
      ln -sf $ISO $(basename ${ISO%%_[0-9]*})_latest.iso

diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index b622d5f..04e3cea 100755 (executable)
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -19,9 +19,18 @@ for file in *.iso ; do
     chmod 664 "${file}" "${file}".md5 "${file}".sha1
 done
 
-for flavour in grml-small_lenny grml-small_sid grml-medium_lenny grml-medium_sid grml_sid grml_lenny \
-               grml64-small_lenny grml64-small_sid grml64-medium_lenny grml64-medium_sid grml64_sid grml64_lenny ; do
-    rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/
+for distri in lenny squeeze sid ; do
+  for flavour in grml-small_$distri   grml-medium_$distri   grml_$distri \
+                 grml64-small_$distri grml64-medium_$distri grml64_$distri ; do
+                 if ls $flavour* 1>/dev/null 2>&1 ; then
+                   rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/
+                 fi
+  done
 done
 
+#for flavour in grml-small_lenny grml-small_squeeze grml-small_sid grml-medium_lenny grml-medium_sid grml_sid grml_lenny \
+#               grml64-small_lenny grml64-small_sid grml64-medium_lenny grml64-medium_sid grml64_sid grml64_lenny ; do
+#    rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/
+#done
+
 ## END OF FILE #################################################################

diff --git a/debian/changelog b/debian/changelog
index c76c3f8..0e1c97c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ grml-live (0.9.20) UNRELEASED; urgency=low
     if someone calls grml-live with a typo in the -s option.
   * Add exception for libewf1 and libstdc++2.10-glibc2.2 in
     /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan.
+  * buildd: add support for building squeeze based ISOs.
 
- -- Michael Prokop <mika@grml.org>  Mon, 03 Aug 2009 01:39:30 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 03 Aug 2009 14:52:42 +0200
 
 grml-live (0.9.19) unstable; urgency=low