More stuff for the offical debian image.

diff --git a/contrib/official-debian-openstack-image/README b/contrib/official-debian-openstack-image/README
new file mode 100644 (file)
index 0000000..305d7ad
--- /dev/null
+++ b/contrib/official-debian-openstack-image/README
@@ -0,0 +1,6 @@
+These scripts are used to generate the official OpenStack Debian images, and
+where written by Steve McIntyre <sledge@debian.org>, who is the person in
+charge of building the Debian official ISO images. I'd like to thanks him for
+his help and work on it.
+
+Thomas Goirand <zigo@debian.org>

diff --git a/contrib/official-debian-openstack-image/debian-cd-pettersson-live b/contrib/official-debian-openstack-image/debian-cd-pettersson-live
new file mode 100644 (file)
index 0000000..3268720
--- /dev/null
+++ b/contrib/official-debian-openstack-image/debian-cd-pettersson-live
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+#set -x
+
+NL="
+"
+OLDIFS=$IFS
+
+TOP="/w"
+LOCALCONF="${TOP}/in"
+STATE="${TOP}/state"
+
+. ${LOCALCONF}/common.sh
+. ${LOCALCONF}/CONF.sh
+
+# Rename the output files to something more appropriate for our use
+RENAME="s,debian-$CODENAME-(.*)-amd64,debian-$VERSION-openstack-amd64,"
+
+mkdir -p ${STATE}
+rm -rf ${STATE}/*
+BUILDNAME="openstack-$CODENAME"
+WORK="${TOP}/work/${BUILDNAME}"
+OUT="${TOP}/out/${BUILDNAME}"
+LOG="${TOP}/out/log"
+mkdir -p ${WORK} ${OUT}
+
+SOURCE_ERROR=0
+
+grab_file () {
+    REMOTE=$(echo $1 | tr -d \')
+    LOCAL="source/$2"
+    SIZE=$3
+    SHA=$4
+
+    if [ ! -f $LOCAL ] ; then
+       wget -O $LOCAL $REMOTE >> ${LOG}/${BUILDNAME}.log
+       local_size=$(stat -c %s $LOCAL)
+       check_alg=${SHA%%:*}
+       check_prog="sha"${check_alg##SHA}"sum"
+       local_check=$(${check_prog} < $LOCAL | awk '{print $1}')
+       if [ ${local_size} != $SIZE ] ; then
+           echo "Size mismatch for $REMOTE" >> ${LOG}/${BUILDNAME}.log
+           SOURCE_ERROR=1
+       fi
+       if [ ${check_alg}":"${local_check} != $SHA ] ; then
+           echo "Checksums mismatch for $REMOTE" >> ${LOG}/${BUILDNAME}.log
+           echo ${check_alg}":"${local_check}
+           echo $SHA
+           SOURCE_ERROR=1
+       fi
+    fi
+}
+
+cd ${WORK}
+
+BUILDSTART=$(now)
+log "Starting full OpenStack image build (codename $CODENAME, version $VERSION) at $BUILDSTART"
+
+START=$(now)
+
+build-openstack-debian-image \
+    -hs $LOCALCONF/openstack-hook \
+    -u http://ftp.se.debian.org/debian \
+    -r $CODENAME \
+    -is 2 2>&1 >> ${LOG}/${BUILDNAME}.log
+
+ERROR=$?
+END=$(now)
+time_spent=$(calc_time $CKSUMSTART $END)
+
+if [ $ERROR -eq 0 ] ; then
+    log "successful build started at $START, ended at $END (took $time_spent)"
+    if [ "$RENAME"x != ""x ] ; then
+       rename -v "$RENAME" * >> ${LOG}/${BUILDNAME}.log
+    fi
+
+    cd ${WORK}
+    mkdir source
+
+    IFS="$NL"
+    for line in $(cat sources); do
+       IFS=$OLDIFS
+       grab_file $line
+       IFS="$NL"
+    done
+    IFS=$OLDIFS
+    tar czf debian-$VERSION-openstack-source.tar.gz source
+    rm -rf source sources
+
+    mv * ${OUT}
+
+    CKSUMSTART=(now)
+    cd ${OUT} && checksum_files
+    END=$(now)
+    time_spent=$(calc_time $CKSUMSTART $END)
+    log "checksums started at $CKSUMSTART, ended at $END (took $time_spent)"
+else
+    log "FAILED with error $error, build started at $START, ended at $END (took $time_spent)"
+fi
+
+if [ $SOURCE_ERROR -ne 0 ] ; then
+    log "FAILED to download sources"
+    ERROR=2
+fi
+
+time_spent=$(calc_time $BUILDSTART $END)
+log "DONE. ERROR=$ERROR $BUILDNAME run started at $BUILDSTART, ended at $END (took $time_spent)"

diff --git a/contrib/official-debian-image-hook b/contrib/official-debian-openstack-image/openstack-hook
similarity index 100%
rename from contrib/official-debian-image-hook
rename to contrib/official-debian-openstack-image/openstack-hook