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

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 2f57a51a1b18d44544d51f1ad4370ff1c05ac849
Merge: af30df954a964d13e4ab42fb31e18de5a4543746 9654efd0eebfa92fdcbc39b156cbb2d42ee013fb
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 22 23:32:13 2009 +0200

    Merge branch 'master' of ssh://nomeata@git.debian.org/git/pkg-fso/files

diff --combined install.sh
index 6daefd0,7fa7c87..3a34aad
--- a/install.sh
+++ b/install.sh
@@@ -67,10 -67,6 +67,6 @@@ FSO_DEVICE_AUTODETECTED=`grep GTA /proc
  if [ -z "$FSO_DEVICE" -a -n "$FSO_DEVICE_AUTODETECTED" ]; then
  	FSO_DEVICE=$FSO_DEVICE_AUTODETECTED
  fi
- if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
- 	echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
- 	exit 1
- fi
  
  # this is an user variable, which by default depends on the FSO_DEVICE value
  HOSTNAME=${HOSTNAME:-debian}
@@@ -94,7 -90,7 +90,7 @@@ intern_no_partitioning="
  # with packages for a basic debian with network connectivity
  CDEBOOTSTRAP_FLAVOUR=minimal
  CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.5_armel.deb
 -CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init-tools,wget,openssh-client
 +CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init-tools,wget,openssh-client,install-info
  # This gets passed to cdebuildstrap. currently not used
  CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
  
@@@ -102,7 -98,7 +98,7 @@@
  # 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 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 stalonetray 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
@@@ -365,6 -361,7 +361,7 @@@ OPTION
  	options have been implemented to be set as arguments:
  
          -h|--help    shows this information
+ 	--verbose    same as invocation with VERBOSE=true as environment variable
  	--apt-options <options>
                       sets the APT_OPTIONS variable
  	--hostname <name>
@@@ -813,7 -810,7 +810,7 @@@ action_debian () 
  	if [ -n "$VERBOSE" ]; then
  		CDEBOOTSTRAP_EXTRA_FLAGS="$CDEBOOTSTRAP_EXTRA_FLAGS -v"
  	fi
- 	cdebootstrap-static --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
+ 	cdebootstrap-static $CDEBOOTSTRAP_EXTRA_FLAGS --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
  		--include=$CDEBOOTSTRAP_EXTRA_PACKAGES \
  		--exclude=$CDEBOOTSTRAP_EXCLUDE_PACKAGES sid "$INST_DIR" $INST_MIRROR
  
@@@ -1128,7 -1125,7 +1125,7 @@@ __END_
  	echo " * Installing /root/.xsession"
  	cat > "$INST_DIR/root/.xsession" <<EOMATCHBOX
  #!/bin/sh
- trayer --edge top &
+ stalonetray &
  openmoko-panel-plugin &
  zhone &
  exec matchbox-window-manager -use_titlebar no -use_cursor no
@@@ -1436,7 -1433,6 +1433,6 @@@ f
  
  # internal variable
  
- VERBOSE=""
  showHelp=""
  
  # parse options
@@@ -1496,12 -1492,23 +1492,23 @@@ d
  			MOUNT_PROC="true"
  			;;
  		 "all")
- 			echo "Running all stages"
- 			action_all
+ 			if [ -z "$showHelp" ]; then
+ 				echo "Running all stages"
+ 				if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
+ 					echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
+ 					exit 1
+ 				fi
+ 				action_all
+ 				echo "I: Done with all stages"
+ 			fi
  			;;
  		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks"|"cleanup")
  			if [ -z "$showHelp" ]; then
  				echo "Running stage $i"
+ 				if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
+ 					echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
+ 					exit 1
+ 				fi
  				action_$i
  				echo "I: Done with stage $i"
  			fi

-- 
Various non-packaged files