diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/cron.daily | 36 | ||||
| -rw-r--r-- | debian/default | 22 |
3 files changed, 38 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index f09a07f..0b503e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-package (0.99.19-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Wed, 31 Jan 2007 12:38:00 +0100 + live-package (0.99.18-1) unstable; urgency=low * New upstream release. diff --git a/debian/cron.daily b/debian/cron.daily index 50f34b5..f330e1f 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -22,40 +22,42 @@ then fi # Check for build directory -if [ ! -d "${DIRECTORY}" ] +if [ ! -d "${AUTOBUILD_DIRECTORY}" ] then - mkdir -p "${DIRECTORY}" + mkdir -p "${AUTOBUILD_DIRECTORY}" else # FIXME: maybe we should just remove the left overs. - echo "E: ${DIRECTORY} needs cleanup." + echo "E: ${AUTOBUILD_DIRECTORY} needs cleanup." exit 1 fi # Process image autobuilding -cd "${DIRECTORY}" +cd "${AUTOBUILD_DIRECTORY}" -for DISTRIBUTION in ${DISTRIBUTIONS} +for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} do - for FLAVOUR in ${FLAVOURS} + for FLAVOUR in ${AUTOBUILD_FLAVOURS} do - if [ ! -f "${SERVER}"/daily-release/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}_${DATE}.txt ] + if [ ! -f "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}.txt ] then # Generating images mkdir debian-live - make-live -d ${DISTRIBUTION} -p ${FLAVOUR} -m ${MIRROR} ${OPTIONS} > debian-live/log.txt 2>&1 + make-live -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 fi if [ -f debian-live/binary.iso ] && [ -f debian-live/source.iso ] then - # Moving images - mkdir -p "${SERVER}"/daily-release/${DATE}/log - mv debian-live/log.txt "${SERVER}"/daily-release/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}_${DATE}.txt + # Moving logs + mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log + mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-log.txt + mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-packages.txt - mkdir -p "${SERVER}"/daily-release/${DATE}/${ARCHITECTURE} - mv debian-live/binary.iso "${SERVER}"/daily-release/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso + # Moving images + mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE} + mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.iso - mkdir -p "${SERVER}"/daily-release/${DATE}/source - mv debian-live/source.iso "${SERVER}"/daily-release/${DATE}/source/debian-live-${DISTRIBUTION}-source-${FLAVOUR}.iso + mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/source + mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_FLAVOUR}.iso fi rm -rf debian-live @@ -63,5 +65,5 @@ do done # Cleanup -umount -f "${DIRECTORY}"/debian-live/chroot/proc > /dev/null 2>&1 -rm -rf "${DIRECTORY}" +umount -f "${AUTOBUILD_DIRECTORY}"/debian-live/chroot/proc > /dev/null 2>&1 +rm -rf "${AUTOBUILD_DIRECTORY}" diff --git a/debian/default b/debian/default index bd8e7fd..50ccb2a 100644 --- a/debian/default +++ b/debian/default @@ -2,12 +2,16 @@ AUTOBUILD="false" -DISTRIBUTIONS="etch sid" -FLAVOURS="minimal standard kde gnome xfce" -MIRROR="http://ftp.debian.org/debian/" -OPTIONS="--with-source" - -DIRECTORY="/srv/tmp/make-live" -SERVER="/srv/debian-live" -ARCHITECTURE="`dpkg --print-architecture`" -DATE="`date +%Y%m%d`" +AUTOBUILD_DISTRIBUTIONS="etch sid" +AUTOBUILD_FLAVOURS="minimal standard kde-desktop gnome-desktop xfce-desktop" +AUTOBUILD_OPTIONS="--tasks laptop --with-source" + +AUTOBUILD_DIRECTORY="/srv/tmp/make-live" +AUTOBUILD_SERVER="/srv/debian-live" +AUTOBUILD_ARCHITECTURE="`dpkg --print-architecture`" +AUTOBUILD_DATE="`date +%Y%m%d`" + +LIVE_MIRROR="http://ftp.debian.org/debian/" + +# Source /etc/make-live.conf +# . /etc/make-live.conf |