[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-23-ge2da905
Daniel Baumann
daniel at debian.org
Sat Feb 20 14:13:07 UTC 2010
The following commit has been merged in the debian-next branch:
commit e2da90550597781f0cd15490e9389c9881597a40
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 15:09:04 2010 +0100
Updating image autobuild script.
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index ac98ca1..709fc01 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -14,75 +14,81 @@ MIRROR_SECURITY="${MIRROR_SECURITY:-http://security.debian.org/}"
ARCHITECTURE="$(dpkg --print-architecture)"
DATE="$(date +%Y%m%d)"
-# Distribution defaults
-APT_RECOMMENDS="true"
-BINARY_INDICES="true"
-DEBIAN_INSTALLER="live"
-DEBIAN_INSTALLER_GUI="true"
-PACKAGES="--packages live-installer-launcher"
-TASKSEL="tasksel"
-
-# Distribution specific options (ugly!)
-case "${DISTRIBUTIONS}" in
- lenny)
- APT_RECOMMENDS="false"
- BINARY_INDICES="true"
- DEBIAN_INSTALLER="false"
- PACKAGES=""
- TASKSEL="aptitude"
-
- case "${ARCHITECTURE}" in
- amd64)
- case "${FLAVOUR}" in
- gnome-desktop)
- BINARY_INDICES="false"
-
- mkdir -p config/chroot_local-hooks
- cd config/chroot_local-hooks
- echo "apt-get remove --yes --purge openoffice.org-help-en-us" > package-removals
- echo "apt-get remove --yes --purge epiphany-browser epiphany-browser-data epiphany-extensions epiphany-gecko" >> package-removals
- echo "apt-get remove --yes --purge gnome-user-guide" >> package-removals
- cd -
- ;;
-
- kde-desktop)
- BINARY_INDICES="false"
- ;;
- esac
- ;;
-
- i386)
- case "${FLAVOUR}" in
- gnome-desktop|kde-desktop)
- BINARY_INDICES="false"
- KERNEL="-k 686"
- ;;
- esac
- ;;
+Set_defaults ()
+{
+ # Distribution defaults
+ APT_RECOMMENDS="true"
+ BINARY_INDICES="true"
+ DEBIAN_INSTALLER="live"
+ DEBIAN_INSTALLER_GUI="true"
+ PACKAGES="--packages live-installer-launcher"
+ TASKSEL="tasksel"
+
+ # Distribution specific options (ugly!)
+ case "${DISTRIBUTION}" in
+ lenny)
+ APT_RECOMMENDS="false"
+ BINARY_INDICES="true"
+ DEBIAN_INSTALLER="false"
+ PACKAGES=""
+ TASKSEL="aptitude"
+
+ case "${ARCHITECTURE}" in
+ amd64)
+ case "${FLAVOUR}" in
+ gnome-desktop)
+ BINARY_INDICES="false"
+
+ mkdir -p config/chroot_local-hooks
+ cd config/chroot_local-hooks
+ echo "apt-get remove --yes --purge openoffice.org-help-en-us" > package-removals
+ echo "apt-get remove --yes --purge epiphany-browser epiphany-browser-data epiphany-extensions epiphany-gecko" >> package-removals
+ echo "apt-get remove --yes --purge gnome-user-guide" >> package-removals
+ cd -
+ ;;
+
+ kde-desktop)
+ BINARY_INDICES="false"
+ ;;
+ esac
+ ;;
+
+ i386)
+ case "${FLAVOUR}" in
+ gnome-desktop|kde-desktop)
+ BINARY_INDICES="false"
+ KERNEL="-k 686"
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ squeeze)
+ DEBIAN_INSTALLER_GUI="false"
+
+ LIVE_INSTALLER="16"
+ LIVE_INITRAMFS="1.173.2-1"
+
+ mkdir -p config/binary_local-udebs
+ cd config/binary_local-udebs
+ wget http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer_${LIVE_INSTALLER}.dsc \
+ http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer_${LIVE_INSTALLER}.tar.gz \
+ http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer_${LIVE_INSTALLER}_i386.udeb
+ cd -
+
+ mkdir -p config/chroot_local-packages
+ wget http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer_${LIVE_INSTALLER}.dsc \
+ http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer_${LIVE_INSTALLER}.tar.gz \
+ http://live.debian.net/archive/packages/live-installer/${LIVE_INSTALLER}/live-installer-launcher_${LIVE_INSTALLER}_all.deb \
+ http://live.debian.net/archive/packages/live-initramfs/${LIVE_INITRAMFS}/live-initramfs_${LIVE_INITRAMFS}.diff.gz \
+ http://live.debian.net/archive/packages/live-initramfs/${LIVE_INITRAMFS}/live-initramfs_${LIVE_INITRAMFS}.dsc \
+ http://live.debian.net/archive/packages/live-initramfs/${LIVE_INITRAMFS}/live-initramfs_${LIVE_INITRAMFS}_all.deb \
+ http://live.debian.net/archive/packages/live-initramfs/${LIVE_INITRAMFS}/live-initramfs_$(echo ${LIVE_INITRAMFS} | awk -F- '{ print $1 }').orig.tar.gz
+ cd -
+ ;;
esac
- ;;
-
- squeeze)
- DEBIAN_INSTALLER_GUI="false"
-
- mkdir -p config/binary_local-udebs
- cd config/binary_local-udebs
- wget http://live.debian.net/archive/packages/live-installer/16/live-installer_16.dsc \
- http://live.debian.net/archive/packages/live-installer/16/live-installer_16.tar.gz \
- http://live.debian.net/archive/packages/live-installer/16/live-installer_16_i386.udeb
- cd -
-
- mkdir -p config/chroot_local-packages
- wget http://live.debian.net/archive/packages/live-installer/16/live-installer_16.dsc \
- http://live.debian.net/archive/packages/live-installer/16/live-installer_16.tar.gz \
- http://live.debian.net/archive/packages/live-installer/16/live-installer-launcher_16_all.deb \
- http://live.debian.net/archive/packages/live-initramfs/1.173.2-1/live-initramfs_1.173.2-1.diff.gz \
- http://live.debian.net/archive/packages/live-initramfs/1.173.2-1/live-initramfs_1.173.2-1.dsc \
- http://live.debian.net/archive/packages/live-initramfs/1.173.2-1/live-initramfs_1.173.2-1_all.deb \
- http://live.debian.net/archive/packages/live-initramfs/1.173.2-1/live-initramfs_1.173.2.orig.tar.gz
- cd -
- ;;
-esac
+}
# Build images
for DISTRIBUTION in ${DISTRIBUTIONS}
@@ -91,8 +97,6 @@ do
for FLAVOUR in ${FLAVOURS}
do
- mkdir -p config
-
if [ -e .stage ]
then
lh clean
@@ -107,6 +111,8 @@ do
rm -rf cache/packages*
rm -rf cache/stages_rootfs
+ Set_defaults
+
lh config \
--apt-recommends ${APT_RECOMMENDS} \
--binary-indices ${BINARY_INDICES} \
--
live-helper
More information about the debian-live-changes
mailing list