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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a59c6b9f491d549c9d1d0c025c0d71cfe9b2b735
Merge: 68d149398d50c734c9db76a82dd7d25894b738b4 e96a9f9a4fef05e2a47e65d7b8f24e1a8bd08c4e
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Feb 21 13:49:43 2009 +0100

    Merge branch 'vfat'

diff --combined install.sh
index aab1136,a6a1608..5780edc
--- a/install.sh
+++ b/install.sh
@@@ -213,7 -213,6 +213,7 @@@ ENVIRONMEN
  	WITH_WIFI    determines how to configure the wireless connections. Set
                       to 'none' will not install anything (default), 'wicd' is
                       supported as an experimental setup (set to '$WITH_WIFI').
 +                     This is not yet functional.
  
      Stages:
  
@@@ -257,7 -256,7 +257,7 @@@ OPTION
  	--part1-fs   sets the SD_PART1_FS variable
  	--part1-size sets the SD_PART1_SIZE variable
  	--swap-size  sets the SD_SWAP_SIZE variable
 -	--with-wifi  sets the WITH_WIFI variable
 +	--with-wifi  sets the WITH_WIFI variable (experimental, not functional)
  
  BUGS
  	Only the current (second) generation of devices is supported.
@@@ -609,22 -608,15 +609,22 @@@ rm -f /tmp/cdebootstrap.de
  	case "$WITH_WIFI" in
  	  "wicd")
  		echo " * added wicd to list of packages to install"
 +		echo
 +		echo "   W: You have selected the option --with-wifi wicd"
 +		echo "      which is still under development. Please don't"
 +		echo "      expect it to work, you will have to manually"
 +		echo "      install the wicd package after booting into"
 +		echo "      the system."
 +		echo
  		CDEBOOTSTRAP_EXTRA_PACKAGES=$CDEBOOTSTRAP_EXTRA_PACKAGES,wicd
 -		CDEBOOTSTRAP_FLAVOUR=build
 +		#CDEBOOTSTRAP_FLAVOUR=build
  		;;
  	  "none")
  		if [ -n "$VERBOSE" ]; then echo "* support for wifi left for manual installation"; fi
  		;;
  	  *)
  		echo
 -		echo "Unsupported Wifi: '$WITH_WIFI'"
 +		echo "Unsupported Wifi: '$WITH_WIFI'."
  		echo
  		exit 1
  		;;
@@@ -879,21 -871,67 +879,67 @@@ echo "I: System configured
  # Stage kernel
  #
  action_kernel () {
- echo "Installing kernel package"
- 
- if [ "$SD_PART1_FS" = "vfat" ]; then
- 	echo "E: when using $SD_PART1_FS as filesystem for the first microSD card"
- 	echo "   partition, you should manully install the kernel, since dpkg"
- 	echo "   does not support non-POSIX filesystems:"
- 	echo "     http://bugs.debian.org/bug=315493"
- 	exit 1
- fi
- 
- chroot $INST_DIR /bin/sh -e <<__END_CHROOT__
- apt-get --yes install linux-image-2.6.28-openmoko-gta02
+ 	echo "Installing kernel package"
+ 
+ 	intern_cmd="apt-get --yes install linux-image-2.6.28-openmoko-gta02"
+ 
+ 	if [ "$SD_PART1_FS" = "vfat" ]; then
+ 		intern_bootmountpoint=$(mount | grep "^${SD_DEVICE}p1"| cut -f3 -d\ )
+ 		if [ -z "$intern_bootmountpoint" -o "boot" != "$(basename "$intern_bootmountpoint")" ]; then
+ 			echo " * installing to /boot"
+ 			chroot $INST_DIR $intern_cmd
+ 			echo " * cleaning apt cache"
+ 			chroot $INST_DIR apt-get clean
+ 			echo " * copying /boot/uImage.bin to first partition"
+ 			if [ -z "$intern_bootmountpoint" ]; then
+ 				if [ -n "$VERBOSE" ]; then
+ 					echo "    Mounting first partition to /mnt/tmp_first_part_$$";
+ 				fi
+ 				mkdir /mnt/tmp_first_part_$$
+ 				mount ${SD_DEVICE}p1 /mnt/tmp_first_part_$$
+ 
+ 				if [ -n "$VERBOSE" ]; then
+ 					echo "    Copying $INST_DIR/boot/uImage.bin to /mnt/tmp_first_part_$$/"
+ 				fi
+ 				cp "$INST_DIR/boot/uImage.bin" "/mnt/tmp_first_part_$$/"
+ 
+ 				if [ -n "$VERBOSE" ]; then
+ 					echo "    Unmounting first partition from /mnt/tmp_first_part_$$"
+ 				fi
+ 				umount /mnt/tmp_first_part_$$
+ 				rmdir /mnt/tmp_first_part_$$
+ 			else 
+ 				if [ -n "$VERBOSE" ]; then
+ 					echo "    Found first partitional already mounted to '$intern_bootmountpoint'."
+ 				fi
+ 				if [ -n "$VERBOSE" ]; then
+ 					echo "    Copying $INST_DIR/boot/uImage.bin to '$intern_bootmountpoint/'."
+ 				fi
+ 				cp "$INST_DIR/boot/uImage.bin" "$intern_bootmountpoint/"
+ 			fi
+ 			
+ 		else
+ 			echo "W: when using $SD_PART1_FS as filesystem for the first microSD card"
+ 			echo "   partition, you should manually install the kernel, since dpkg"
+ 			echo "   does not support non-POSIX filesystems:"
+ 			echo "     http://bugs.debian.org/bug=315493"
+ 			echo
+ 			echo "   Make sure, the first partition is not mounted to the /boot"
+ 			echo "   directory. Then "
+ 			echo "      $intern_cmd"
+ 			echo "   and copy /boot/uImage.bin to your first partition. When no longer"
+ 			echo "   mounted to /boot, you may also rerun '$0 --part1-fs vfat kernel'."
+ 			return 0
+ 		fi
+ 	else
+ 		chroot $INST_DIR /bin/sh -e <<__END_CHROOT__
+ $intern_cmd
  apt-get clean
  __END_CHROOT__
- echo "I: Kernel installed"
+ 	fi
+ 
+ 	echo "I: Kernel installed"
+ 
  
  if [ "$QI" = "true" ]; then
  	echo "Prepare system for booting with Qi"

-- 
Various non-packaged files