From f96dfbfc04c41274fc0f2ec94a2951382eef4081 Mon Sep 17 00:00:00 2001
From: Michael Prokop
Date: Fri, 18 Mar 2011 11:43:29 +0100
Subject: [PATCH] Add support for wheezy, drop lenny (being oldstable nowadays)
instead.
---
buildd/cleanup.sh | 6 ++--
buildd/cronjob.sh | 12 +++----
buildd/files/HEADER.html | 40 ++++------------------
buildd/files/header.txt | 14 ++++----
buildd/functions.sh | 1 +
...sh => grml-live_autobuild_grml-large_wheezy.sh} | 4 +--
...h => grml-live_autobuild_grml-medium_wheezy.sh} | 4 +--
...sh => grml-live_autobuild_grml-small_wheezy.sh} | 4 +--
... => grml-live_autobuild_grml64-large_wheezy.sh} | 4 +--
...=> grml-live_autobuild_grml64-medium_wheezy.sh} | 4 +--
... => grml-live_autobuild_grml64-small_wheezy.sh} | 4 +--
buildd/link_latest.sh | 6 ++--
buildd/upload_isos.sh | 7 +---
13 files changed, 40 insertions(+), 70 deletions(-)
rename buildd/{grml-live_autobuild_grml-large_lenny.sh => grml-live_autobuild_grml-large_wheezy.sh} (85%)
rename buildd/{grml-live_autobuild_grml-medium_lenny.sh => grml-live_autobuild_grml-medium_wheezy.sh} (82%)
rename buildd/{grml-live_autobuild_grml-small_lenny.sh => grml-live_autobuild_grml-small_wheezy.sh} (83%)
rename buildd/{grml-live_autobuild_grml64-large_lenny.sh => grml-live_autobuild_grml64-large_wheezy.sh} (84%)
rename buildd/{grml-live_autobuild_grml64-medium_lenny.sh => grml-live_autobuild_grml64-medium_wheezy.sh} (82%)
rename buildd/{grml-live_autobuild_grml64-small_lenny.sh => grml-live_autobuild_grml64-small_wheezy.sh} (83%)
diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 3d64346..ef8b2b4 100755
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -19,9 +19,9 @@ cd $MIRROR_DIRECTORY || exit 2
DAYS=3
REMOVE_ME=""
-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
+for flavour in grml-medium_squeeze grml-medium_wheezy grml-medium_sid grml-small_squeeze grml-small_wheezy grml-small_sid \
+ grml64-medium_squeeze grml64-medium_wheezy grml64-medium_sid grml64-small_squeeze grml64-small_wheezy grml64-small_sid \
+ grml64_squeeze grml64_wheezy grml64_sid grml_squeeze grml_wheezy 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")
diff --git a/buildd/cronjob.sh b/buildd/cronjob.sh
index c69291b..311f86f 100755
--- a/buildd/cronjob.sh
+++ b/buildd/cronjob.sh
@@ -23,25 +23,25 @@ fi
echo $$ > /usr/share/grml-live/buildd/buildd_running
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_sid.sh
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_sid.sh
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_lenny.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_squeeze.sh && \
+/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_wheezy.sh && \
/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_sid.sh
/usr/share/grml-live/buildd/upload_isos.sh && \
diff --git a/buildd/files/HEADER.html b/buildd/files/HEADER.html
index 82b0221..6783dcb 100644
--- a/buildd/files/HEADER.html
+++ b/buildd/files/HEADER.html
@@ -42,27 +42,6 @@ all. So: PLEASE USE THEM WITH CAUTION!
Please report any bugs you notice.
-
-
-
-
-
-
-
Download
Note: the first link on each line points to the most recent available
@@ -71,11 +50,6 @@ sha1 checksum file. The link named 'older versions' points to the directory of
the according grml flavour providing the current as well as older available
snapshots.
-
-
Debian/stable based grml-ISOs
-Debian/oldstable based grml-ISOs
+Debian/testing based grml-ISOs
- - grml_lenny (sha1, older versions): normal, 32bit version based on Debian/lenny (oldstable)
- - grml-medium_lenny (sha1, older versions): medium, 32bit version based on Debian/lenny (oldstable)
- - grml-small_lenny (sha1, older versions): small, 32bit version based on Debian/lenny (oldstable)
- - grml64_lenny (sha1, older versions): normal, 64bit version based on Debian/lenny (oldstable)
- - grml64-medium_lenny (sha1, older versions): medium, 64bit version based on Debian/lenny (oldstable)
- - grml64-small_lenny (sha1, older versions): small, 64bit version based on Debian/lenny (oldstable)
+ - grml_wheezy (sha1, older versions): normal, 32bit version based on Debian/wheezy (oldstable)
+ - grml-medium_wheezy (sha1, older versions): medium, 32bit version based on Debian/wheezy (oldstable)
+ - grml-small_wheezy (sha1, older versions): small, 32bit version based on Debian/wheezy (oldstable)
+ - grml64_wheezy (sha1, older versions): normal, 64bit version based on Debian/wheezy (oldstable)
+ - grml64-medium_wheezy (sha1, older versions): medium, 64bit version based on Debian/wheezy (oldstable)
+ - grml64-small_wheezy (sha1, older versions): small, 64bit version based on Debian/wheezy (oldstable)
Debian/unstable based grml-ISOs
diff --git a/buildd/files/header.txt b/buildd/files/header.txt
index 08c513b..9c41d96 100644
--- a/buildd/files/header.txt
+++ b/buildd/files/header.txt
@@ -14,23 +14,23 @@ Thanks for helping us improve grml!
Explanation of filenames (the date describes the time of building the ISO):
- * grml_lenny: normal, 32bit version based on Debian/lenny (oldstable)
* grml_squeeze: normal, 32bit version based on Debian/squeeze (stable)
+ * grml_wheezy: normal, 32bit version based on Debian/wheezy (testing)
* grml_sid: normal, 32bit version based on Debian/sid (unstable)
- * grml-medium_lenny: medium, 32bit version based on Debian/lenny (oldstable)
* grml-medium_squeeze: medium, 32bit version based on Debian/squeeze (stable)
+ * grml-medium_wheezy: medium, 32bit version based on Debian/wheezy (testing)
* grml-medium_sid: medium, 32bit version based on Debian/sid (unstable)
- * grml-small_lenny: small, 32bit version based on Debian/lenny (oldstable)
* grml-small_squeeze: small, 32bit version based on Debian/squeeze (stable)
+ * grml-small_wheezy: small, 32bit version based on Debian/wheezy (testing)
* grml-small_sid: small, 32bit version based on Debian/sid (unstable)
- * grml64_lenny: normal, 64bit version based on Debian/lenny (oldstable)
* grml64_squeeze: normal, 64bit version based on Debian/squeeze (stable)
+ * grml64_wheezy: normal, 64bit version based on Debian/wheezy (testing)
* grml64_sid: normal, 64bit version based on Debian/sid (unstable)
- * grml64-medium-lenny: medium, 64bit version based on Debian/lenny (oldstable)
* grml64-medium-squeeze: medium, 64bit version based on Debian/squeeze (stable)
+ * grml64-medium-wheezy: medium, 64bit version based on Debian/wheezy (testing)
* grml64-medium-sid: medium, 64bit version based on Debian/sid (unstable)
- * grml64-small-lenny: small, 64bit version based on Debian/lenny (oldstable)
* grml64-small-squeeze: small, 64bit version based on Debian/squeeze (stable)
+ * grml64-small-wheezy: small, 64bit version based on Debian/wheezy (testing)
* grml64-small-sid: small, 64bit version based on Debian/sid (unstable)
- Michael 'mika' Prokop - http://grml.org/
+ -- Michael 'mika' Prokop - http://grml.org/
diff --git a/buildd/functions.sh b/buildd/functions.sh
index 1320074..c05a6ae 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -58,6 +58,7 @@ grml_live_run() {
case $SUITE in
sid) CODENAME=sid ;;
squeeze) CODENAME=squ ;;
+ wheezy) CODENAME=wheez ;;
lenny) CODENAME=lenny ;;
etch) CODENAME=etch ;;
esac
diff --git a/buildd/grml-live_autobuild_grml-large_lenny.sh b/buildd/grml-live_autobuild_grml-large_wheezy.sh
similarity index 85%
rename from buildd/grml-live_autobuild_grml-large_lenny.sh
rename to buildd/grml-live_autobuild_grml-large_wheezy.sh
index b891d07..135d65b 100755
--- a/buildd/grml-live_autobuild_grml-large_lenny.sh
+++ b/buildd/grml-live_autobuild_grml-large_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386'
NAME=grml
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/grml-live_autobuild_grml-medium_lenny.sh b/buildd/grml-live_autobuild_grml-medium_wheezy.sh
similarity index 82%
rename from buildd/grml-live_autobuild_grml-medium_lenny.sh
rename to buildd/grml-live_autobuild_grml-medium_wheezy.sh
index 3dce55b..6fd32f3 100755
--- a/buildd/grml-live_autobuild_grml-medium_lenny.sh
+++ b/buildd/grml-live_autobuild_grml-medium_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml-medium_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml-medium_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386'
NAME=grml-medium
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/grml-live_autobuild_grml-small_lenny.sh b/buildd/grml-live_autobuild_grml-small_wheezy.sh
similarity index 83%
rename from buildd/grml-live_autobuild_grml-small_lenny.sh
rename to buildd/grml-live_autobuild_grml-small_wheezy.sh
index 71d46c5..31b9b38 100755
--- a/buildd/grml-live_autobuild_grml-small_lenny.sh
+++ b/buildd/grml-live_autobuild_grml-small_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml-small_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml-small_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,I386'
NAME=grml-small
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/grml-live_autobuild_grml64-large_lenny.sh b/buildd/grml-live_autobuild_grml64-large_wheezy.sh
similarity index 84%
rename from buildd/grml-live_autobuild_grml64-large_lenny.sh
rename to buildd/grml-live_autobuild_grml64-large_wheezy.sh
index 4905d7a..f385835 100755
--- a/buildd/grml-live_autobuild_grml64-large_lenny.sh
+++ b/buildd/grml-live_autobuild_grml64-large_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml64_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml64_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,AMD64'
NAME=grml64
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/grml-live_autobuild_grml64-medium_lenny.sh b/buildd/grml-live_autobuild_grml64-medium_wheezy.sh
similarity index 82%
rename from buildd/grml-live_autobuild_grml64-medium_lenny.sh
rename to buildd/grml-live_autobuild_grml64-medium_wheezy.sh
index 92a1c1b..f9e406a 100755
--- a/buildd/grml-live_autobuild_grml64-medium_lenny.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-medium_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml64-medium_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,AMD64'
NAME=grml64-medium
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/grml-live_autobuild_grml64-small_lenny.sh b/buildd/grml-live_autobuild_grml64-small_wheezy.sh
similarity index 83%
rename from buildd/grml-live_autobuild_grml64-small_lenny.sh
rename to buildd/grml-live_autobuild_grml64-small_wheezy.sh
index 953f232..b1c0088 100755
--- a/buildd/grml-live_autobuild_grml64-small_lenny.sh
+++ b/buildd/grml-live_autobuild_grml64-small_wheezy.sh
@@ -2,8 +2,8 @@
# settings for grml_live_run:
DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-small_lenny_$DATE.iso
-SUITE=lenny
+ISO_NAME=grml64-small_wheezy_$DATE.iso
+SUITE=wheezy
CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,AMD64'
NAME=grml64-small
SCRIPTNAME="$(basename $0)"
diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh
index a2b5626..b968797 100755
--- a/buildd/link_latest.sh
+++ b/buildd/link_latest.sh
@@ -17,9 +17,9 @@ DAILY_DIR=/srv/mirror/www.grml.org/daily
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
+for flavour in grml-medium_squeeze grml-medium_wheezy grml-medium_sid grml-small_squeeze grml-small_wheezy grml-small_sid \
+ grml64-medium_squeeze grml64-medium_wheezy grml64-medium_sid grml64-small_squeeze grml64-small_wheezy grml64-small_sid \
+ grml64_squeeze grml64_wheezy grml64_sid grml_squeeze grml_wheezy grml_sid ; do
ISO="$(ls -1 $flavour/*.iso | tail -1)"
if [ -n "$ISO" ] ; then
latest="$(basename ${ISO%%_[0-9]*})_latest.iso"
diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 04e3cea..29960ae 100755
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -19,7 +19,7 @@ for file in *.iso ; do
chmod 664 "${file}" "${file}".md5 "${file}".sha1
done
-for distri in lenny squeeze sid ; do
+for distri in squeeze wheezy 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
@@ -28,9 +28,4 @@ for distri in lenny squeeze sid ; do
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 #################################################################
--
2.1.4