[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-17-g1161ef2
Daniel Baumann
daniel at debian.org
Sat Feb 20 13:23:00 UTC 2010
The following commit has been merged in the debian-next branch:
commit 1161ef2bc8298fd92335e0d1714708273a4ab951
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 14:18:57 2010 +0100
Updating image autobuild script.
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index 9bd85b4..5de46b9 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -5,82 +5,91 @@ DISTRIBUTIONS="${DISTRIBUTIONS:-lenny squeeze sid}"
FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop lxde-desktop xfce-desktop}"
SOURCE="${SOURCE:-true}"
-MIRROR="${MIRROR:-http://cdn.debian.net/debian/}"
-MIRROR_SECURITY="${MIRROR_SECURITY:-http://security.debian.org/}"
+#MIRROR="${MIRROR:-http://cdn.debian.net/debian/}"
+#MIRROR_SECURITY="${MIRROR_SECURITY:-http://security.debian.org/}"
# Dynamic variables
ARCHITECTURE="$(dpkg --print-architecture)"
DATE="$(date +%Y%m%d)"
-for DISTRIBUTION in ${DISTRIBUTIONS}
-do
- rm -rf cache/stages*
-
- for FLAVOUR in ${FLAVOURS}
- do
- mkdir -p config
-
- if [ -e .stage ]
- then
- lh clean
- fi
+# Distribution defaults
+APT_RECOMMENDS="true"
+BINARY_INDICES="true"
+DEBIAN_INSTALLER="live"
+TASKSEL="tasksel"
- rm -rf config
- rm -rf cache/packages*
- rm -rf cache/stages_rootfs
+# Distribution specific options (ugly!)
+case "${DISTRIBUTION}" in
+ lenny)
+ APT_RECOMMENDS="false"
+ BINARY_INDICES="true"
+ DEBIAN_INSTALLER="false"
+ TASKSEL="aptitude"
case "${ARCHITECTURE}" in
amd64)
case "${FLAVOUR}" in
gnome-desktop)
+ BINARY_INDICES="false"
+
mkdir -p config/chroot_local-hooks
echo "apt-get remove --yes --purge openoffice.org-help-en-us" > config/chroot_local-hooks/package-removals
echo "apt-get remove --yes --purge epiphany-browser epiphany-browser-data epiphany-extensions epiphany-gecko" >> config/chroot_local-hooks/package-removals
echo "apt-get remove --yes --purge gnome-user-guide" >> config/chroot_local-hooks/package-removals
-
- INDICES="none"
;;
kde-desktop)
- INDICES="none"
+ BINARY_INDICES="false"
;;
esac
;;
i386)
case "${FLAVOUR}" in
- standard|rescue|lxde-desktop|xfce-desktop)
- INDICES="true"
- ;;
-
gnome-desktop|kde-desktop)
+ BINARY_INDICES="false"
KERNEL="-k 686"
- INDICES="none"
;;
esac
;;
esac
+ ;;
+esac
- if [ "${SOURCE}" = "true" ]
- then
- lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends false --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source true --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY}
- else
- lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends false --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source false --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY}
- fi
+# Build images
+for DISTRIBUTION in ${DISTRIBUTIONS}
+do
+ rm -rf cache/stages*
- if [ "${DISTRIBUTION}" = "sid" ]
+ for FLAVOUR in ${FLAVOURS}
+ do
+ mkdir -p config
+
+ if [ -e .stage ]
then
- echo 'deb http://live.debian.net/ sid/snapshots main' > config/chroot_sources/debian-live_sid-snapshots.chroot
- echo 'deb http://live.debian.net/ sid/snapshots main' > config/chroot_sources/debian-live_sid-snapshots.boot
+ lh clean
+ fi
- wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg
- wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.binary.gpg
+ rm -rf config
+ rm -rf cache/packages*
+ rm -rf cache/stages_rootfs
- fi
+ lh config \
+ --apt-recommends ${APT_RECOMMENDS} \
+ --binary-indices ${BINARY_INDICES} \
+ --cache-stages "bootstrap rootfs" \
+ --debian-installer ${DEBIAN_INSTALLER} \
+ --distribution ${DISTRIBUTION} \
+ --mirror-bootstrap ${MIRROR} \
+ --mirror-chroot ${MIRROR} \
+ --mirror-chroot-security ${MIRROR_SECURITY} \
+ --packages-lists ${FLAVOUR} \
+ --source ${SOURCE} \
+ --tasksel ${TASKSEL} ${KERNEL}
lh build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log
- mv binary.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
+ mv binary*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list
mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.packages
@@ -90,22 +99,27 @@ do
mv source.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz.list
fi
- lh clean --binary
- lh config -b usb-hdd
- lh binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log
+ if [ "${DISTRIBUTION}" = "lenny" ]
+ then
+ lh clean --binary
+ lh config -binary-images usb-hdd
+ lh binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log
- mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img
- mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list
- mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.packages
+ mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img
+ mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list
+ mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.packages
+ fi
+
+ lh clean
+ rm -rf cache/stages_rootfs
+ lh config --binary-images net
- lh clean --binary
- lh config -b net
- lh binary 2>&1 | tee debian-live-${DISTRIBUTION}-i386-${FLAVOUR}-net.tar.gz.log
+ lh build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}-net.tar.gz.log
- mv binary-net.tar.gz debian-live-${DISTRIBUTION}-i386-${FLAVOUR}-net.tar.gz
- mv binary.list debian-live-${DISTRIBUTION}-i386-${FLAVOUR}-net.tar.gz.list
- mv binary.packages debian-live-${DISTRIBUTION}-i386-${FLAVOUR}-net.tar.gz.packages
+ mv binary-net.tar.gz debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}-net.tar.gz
+ mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}-net.tar.gz.list
+ mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}-net.tar.gz.packages
- mv binary/*/filesystem.squashfs debian-live-${DISTRIBUTION}-i386-${FLAVOUR}.squashfs
+ mv binary/*/filesystem.squashfs debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.squashfs
done
done
--
live-helper
More information about the debian-live-changes
mailing list