easy-build: allow building all-desktop businesscard and netinst CDs

Also add sanity tests and update README.easy-build for (multi-)desktop
support.
This commit is contained in:
Frans Pop 2008-12-05 14:12:29 +00:00
parent 31e8cfd687
commit bbe66df2eb
2 changed files with 21 additions and 5 deletions

View File

@ -11,7 +11,11 @@ easy-build.sh supports the following variations:
- businesscard, netinst and full CD images, and DVD images - businesscard, netinst and full CD images, and DVD images
- single-architecture and multi-architecture images - single-architecture and multi-architecture images
- optionally include source packages - optionally include source packages
- select to install GNOME (default), KDE or Xfce desktops as desktop task - select to install GNOME (default), KDE, LXDE or Xfce desktops as desktop
task
- create a combined LXDE/Xfce "light desktop" CD
- create a businesscard or netinst CD, or DVD set supporting all four
desktop environments
- creates ISO files by default; creating jigdo files is possible - creates ISO files by default; creating jigdo files is possible
- specify which Debian release to use - specify which Debian release to use
- include custom versions of packages (debs) - include custom versions of packages (debs)

View File

@ -131,16 +131,28 @@ case $DISKTYPE in
;; ;;
esac esac
# By default a GNOME CD/DVD is built, but KDE and Xfce are supported too # By default a GNOME CD/DVD is built, but other desktops are supported too
if [ "$desktop" ] && ([ $DISKTYPE = CD ] || [ $DISKTYPE = DVD ]); then if [ "$desktop" ]; then
TASK=Debian-$desktop if [ ! -e tasks/$CODENAME/task.list.$desktop ]; then
echo "Error: desktop '$desktop' is not supported for $CODENAME"
exit 1
fi
if [ "$desktop" = all ] && [ $DISKTYPE = CD ]; then
echo
echo "WARNING: CD1 by itself can never support installing all desktops!"
echo
fi
if [ $DISKTYPE != BC ] && [ $DISKTYPE != NETINST ]; then
export TASK=Debian-$desktop
fi
if [ "$CODENAME" = etch ]; then if [ "$CODENAME" = etch ]; then
KERNEL_PARAMS="tasks=\"$desktop-desktop, standard\"" KERNEL_PARAMS="tasks=\"$desktop-desktop, standard\""
else else
KERNEL_PARAMS="desktop=$desktop" KERNEL_PARAMS="desktop=$desktop"
fi fi
DESKTOP=$desktop DESKTOP=$desktop
export TASK KERNEL_PARAMS DESKTOP export KERNEL_PARAMS DESKTOP
fi fi
if [ "$LOCAL" ] && [ "$UPDATE_LOCAL" ]; then if [ "$LOCAL" ] && [ "$UPDATE_LOCAL" ]; then