[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 6b959889470ba2fcb35ab4811c6f3bd95922471e

[Luca Capello]

The following commit has been merged in the master branch:
commit 6b959889470ba2fcb35ab4811c6f3bd95922471e
Author: Luca Capello <luca at pca.it>
Date:   Wed May 27 07:38:14 2009 +0200

    install.sh: add user variable ZHONE

diff --git a/install.sh b/install.sh
index 7093790..cbab792 100755
--- a/install.sh
+++ b/install.sh
@@ -62,6 +62,7 @@ SD_PART1_SIZE=${SD_PART1_SIZE:-8}
 SD_PART2_FS=${SD_PART2_FS:-ext3}
 SD_SWAP_SIZE=${SD_SWAP_SIZE:-0}
 SINGLE_PART=${SINGLE_PART:-$QI}
+ZHONE=${ZHONE:-true}
 
 # hardening for the case that a user uses capitals
 lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT FSO_DEVICE
@@ -86,11 +87,11 @@ CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,modul
 # This gets passed to cdebuildstrap. currently not used
 CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
 
-# freesmartphone.org-specific packages
+# freesmartphone.org packages
 # because of some apt-get bug, console-setup must be listed
 # before any other X.Org package, for more information see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435662#45
-FSO_PACKAGES="matchbox-window-manager zhone fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
+FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
 console-setup xserver-xorg-video-fbdev xserver-xorg-input-tslib xserver-xorg-core xserver-xorg xterm xinit xfonts-base x11-xserver-utils"
 
 # well-suited software for the FreeRunner
@@ -272,6 +273,7 @@ ENVIRONMENT
                      package in the Debian archive, which could require
                      a LOT of disk space; set to none if you do not
                      want a Display Manager)
+	ZHONE        set this to true to install the Zhone GUI (set to '$ZHONE')
 
     Stages:
 
@@ -293,7 +295,8 @@ ENVIRONMENT
 	mount        Mounts microSD card partitions under '$INST_DIR'
 	debian       Installs a basic Debian system, including an SSH server
 	apt          Configure APT
-	fso          Installs packages required to use the Zhone GUI
+	fso          Install freesmartphone.org packages (by default this
+                     also include the Zhone GUI, see the ZHONE variable)
 	tasks        Installs packages for a series of tasks. Supported are
                        GAMES  Installs games that were designed with
                               FreeRunner-like devices in mind or that have
@@ -831,17 +834,23 @@ __END__
 # Stage fso
 #
 action_fso () {
-	# TODO
+	echo "Installing freesmartphone.org software"
 
 	ensure_proc_is_mounted
 
-	echo "Installing freesmartphone.org-specific packages"
+	echo "* core packages"
 	chroot "$INST_DIR" /bin/sh -e <<__END_CHROOT__
 export DEBIAN_FRONTEND=noninteractive
 apt-get $APT_OPTIONS install $FSO_PACKAGES
 apt-get clean
 __END_CHROOT__
-	echo "I: freesmartphone.org packages installed"
+
+	echo "* Zhone GUI: $ZHONE"
+	if [ "$ZHONE" = true ]; then
+		chroot "$INST_DIR" apt-get $APT_OPTIONS install zhone
+	fi
+
+	echo "I: freesmartphone.org software installed"
 }
 
 

-- 
Various non-packaged files