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

Steffen Moeller steffen_moeller at gmx.de
Fri Mar 5 21:30:38 UTC 2010


The following commit has been merged in the master branch:
commit 5104a1d35fdef70cb2b6e7068857369b69479d0e
Merge: 0c8820f5508a9cd05339d6de257dec0ccbd8da7a 09fb172d5044c977474cfa0c7f5fff320bb5dab4
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Mar 5 22:29:35 2010 +0100

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

diff --combined install.sh
index e7d38c6,6ae589b..f2a02a5
--- a/install.sh
+++ b/install.sh
@@@ -96,7 -96,7 +96,7 @@@ intern_no_partitioning="
  CDEBOOTSTRAP_FLAVOUR=minimal
  DEBOOTSTRAP_VARIANT=minbase
  CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.5_armel.deb
 -DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.15_all.deb
 +DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.22_all.deb
  CDEBOOTSTRAP_EXTRA_PACKAGES=
  DEBOOTSTRAP_EXTRA_PACKAGES=install-info
  # This gets passed to boot strappers. currently not used
@@@ -595,8 -595,7 +595,8 @@@ __END_
  #
  
  action_testing () {
 -	echo "Testing system setup"
 +
 +	echo "I: Testing system setup"
  
  	intern_packages_required="wget ping fdisk mount umount mkfs.$SD_PART1_FS mkswap gunzip dd sed rdate ar basename dirname"
  	if [ "mkfs.$SD_PART2_FS" != "mkfs.$SD_PART1_FS" ]; then
@@@ -692,7 -691,7 +692,7 @@@
  		exit 1
  	fi
  
 -	echo "I: System setup looks good"
 +	echo "I: Testing system setup - done - looks good"
  }
  
  #
@@@ -710,9 -709,6 +710,9 @@@ action_time () 
  #
  
  action_partition () {
 +
 +	echo "I: Partitioning SD"
 +
  	card_data_warning partition
  	umount_all
  
@@@ -830,8 -826,7 +830,8 @@@ EOSWAPCON
  		sleep 3
  		intern_sleep_seconds=$(( $intern_sleep_seconds + 3 ))
  	done
 -	echo " * Partition table created"
 +
 +	echo "I: Partitioning SD - done - Partition table created"
  }
  
  #
@@@ -839,7 -834,7 +839,7 @@@
  #
  
  action_format () {
 -	echo
 +	echo "I: Formatting SD"
  	card_data_warning format
  	umount_all
  
@@@ -858,7 -853,7 +858,7 @@@
  		mkswap ${SD_DEVICE}p${nextpart}
  	fi
  
 -	echo "I: microSD card ready"
 +	echo "I: Formatting SD - done - microSD card ready"
  }
  
  #
@@@ -866,9 -861,7 +866,9 @@@
  #
  
  action_mount () {
 -	echo "Mounting the newly created system"
 +
 +	echo "I: Mounting the newly created system"
 +
  	if [ ! -d "$INST_DIR" ]; then
  		mkdir -p "$INST_DIR"; 
  		intern_instdir_already_present="" 
@@@ -890,8 -883,8 +890,8 @@@
  			mount -t auto ${SD_DEVICE}p1 "$INST_DIR/boot"
  		fi
  	fi
 -	echo "I: microSD card partitions mounted"
  
 +	echo "I: Mounting the newly created system - done - microSD card partitions mounted"
  }
  
  
@@@ -900,7 -893,7 +900,7 @@@
  #
  
  action_debian () {
 -	echo "Install a basic Debian system"
 +	echo "I: Install a basic Debian system"
  
  	intern_bootstrapper_package=
  	if [ "cdebootstrap" = "$BOOTSTRAPPER" ]; then
@@@ -971,7 -964,7 +971,7 @@@
          # (direct or indirect) dependencies. The DEBIAN_EXTRA_PACKAGES are consequently
          # installed in the action_apt
  
 -	echo "I: Basic Debian system installed - please also install apt"
 +	echo "I: Install a basic Debian system - done - Basic Debian system installed - please also install apt"
  }
  
  
@@@ -980,7 -973,7 +980,7 @@@
  #
  
  action_apt () {
 -	echo "Configuring APT"
 +	echo "I: Configuring APT"
  
  	if ! ensure_proc_is_mounted; then
  		echo "  /proc is needed for APT configuration - please investigate."
@@@ -1038,7 -1031,7 +1038,7 @@@ __END_
  	echo " * Cleaning APT cache"
  	chroot "$INST_DIR" apt-get clean
  
 -	echo "I: APT configured"
 +	echo "I: Configuring APT - done - APT configured"
  }
  
  
@@@ -1047,7 -1040,7 +1047,7 @@@
  #
  
  action_fso () {
 -	echo "Installing freesmartphone.org software"
 +	echo "I: Installing freesmartphone.org software"
  
  	ensure_proc_is_mounted
  
@@@ -1071,7 -1064,7 +1071,7 @@@ __END_CHROOT_
  		echo "skipped (\$ZHONE=$ZHONE)"
  	fi
  
 -	echo "I: freesmartphone.org software installed"
 +	echo "I: Installing freesmartphone.org software - done"
  }
  
  
@@@ -1100,7 -1093,7 +1100,7 @@@ action_tasks () 
  		TASKS="$intern_tasks_defined"
  	fi
  
 -	echo "Performing selected tasks: $TASKS"
 +	echo "I: Performing selected tasks: $TASKS"
  
  	ensure_proc_is_mounted
  
@@@ -1134,8 -1127,6 +1134,8 @@@
  			;;
  		esac
  	done
 +
 +	echo "I: Performing selected tasks - done"
  }
  
  
@@@ -1144,7 -1135,7 +1144,7 @@@
  #
  
  action_configuration () {
 -	echo "Configuring system files for ${FSO_DEVICE}"
 +	echo "I: Configuring system files for ${FSO_DEVICE}"
  
  	root_password_warning
  
@@@ -1230,6 -1221,9 +1230,9 @@@ g_ethe
  ohci-hcd
  hci_usb
  
+ # buttons
+ neo1973kbd
+ 
  __END__
  	if [ "$FSO_DEVICE" = gta01 ]; then
  		cat >> "$INST_DIR/etc/modules" <<__END__
@@@ -1240,6 -1234,9 +1243,9 @@@ __END_
  		cat >> "$INST_DIR/etc/modules" <<__END__
  # audio
  snd-soc-neo1973-gta02-wm8753
+ 
+ # leds
+ leds-neo1973-gta02
  __END__
  	fi
  
@@@ -1381,7 -1378,7 +1387,7 @@@ EOPANELPLUGI
  		chroot "$INST_DIR" apt-get $APT_OPTIONS install $DISPLAY_MANAGER
  	fi
  
 -	echo "I: System configured"
 +	echo "I: Configuring system files for ${FSO_DEVICE} - done - System configured"
  }
  
  
@@@ -1390,7 -1387,7 +1396,7 @@@
  #
  
  action_kernel () {
 -	echo "Installing kernel package"
 +	echo "I: Installing kernel package"
  
  	if [ "$FSO_DEVICE" != gta02 ]; then
  		cat <<EOF
@@@ -1491,8 -1488,6 +1497,8 @@@ __END_CHROOT_
  			fi	
  		fi
  	fi
 +
 +	echo "I: Installing kernel package - done"
  }
  
  
@@@ -1501,7 -1496,7 +1507,7 @@@
  #
  
  action_uboot () {
 -	echo "Modifying U-Boot bootloader menu"
 +	echo "I: Modifying U-Boot bootloader menu"
  
  	if [ "$SD_PART1_FS" = "vfat" ]; then
  		echo "W: When using $SD_PART1_FS as filesystem for the first microSD card"
@@@ -1582,7 -1577,7 +1588,7 @@@ __END_CHROOT_
  	echo " * Unmounting /dev"
  	umount "$INST_DIR/dev"
  
 -	echo "I: U-Boot environment modified"
 +	echo "I: Modifying U-Boot bootloader menu - done"
  }
  
  
@@@ -1592,21 -1587,15 +1598,21 @@@
  
  action_cleanup () {
  
 -	echo "Cleaning the environment"
 +	echo "I: Cleaning the environment"
  
  	echo " * Remove additional packages"
 -	chroot "$INST_DIR" apt-get --yes --purge remove cdebootstrap-helper-rc.d xserver-xorg-input-synaptics
 +	intern_delenda=''
 +	for i in	 cdebootstrap-helper-rc.d xserver-xorg-input-synaptics carthago; do
 +		if dpkg -s $i > /dev/null 2> /dev/null; then
 +			intern_delenda="$intern_delenda $i"
 +		fi
 +	done
 +	chroot "$INST_DIR" apt-get --yes --purge remove $intern_delenda
  
  	echo " * Cleaning APT cache"
  	chroot "$INST_DIR" apt-get clean
  
 -	echo "I: the environment is now clean!"
 +	echo "I: Cleaning the environment - done - the environment is now clean!"
  }
  
  
@@@ -1616,7 -1605,7 +1622,7 @@@
  
  action_unmount () {
  
 -	echo "Unmounting"
 +	echo "I: Unmounting - start"
  
  	if mount | grep -q "$INST_DIR/proc"; then
  		echo -n " * Unmounting proc from install directory"
@@@ -1640,34 -1629,23 +1646,34 @@@
  	fi
  	echo "I: microSD card partitions unmounted"
  
 +	intern_fstablines='E: the intern_fstablines remained unset'
 +	intern_line_or_lines='E: the intern_fstablines remained unset'
  	if [ -z "$intern_instdir_already_present" -o "no" = "$intern_instdir_already_present" ]; then
  		if ! rmdir "$INST_DIR"; then
  			echo "W: Could not remove directory '$INST_DIR'."
  			echo
  		fi
 -
 +		
 +		if [ "$SINGLE_PART" = "true" ]; then
 +			intern_fstablines="${SD_DEVICE}p1  $INST_DIR  auto  defaults,async  0  0"
 +			intern_line_or_lines="line"
 +		else
 +			intern_fstablines="${SD_DEVICE}p1  $INST_DIR/boot  auto  defaults,async  0  0
 +${SD_DEVICE}p2  $INST_DIR  auto  defaults,async  0  0"
 +			intern_line_or_lines="lines"
 +		fi
 +		
  		cat <<EOINSTRUCTIONS
  
 -The directory '$INST_DIR' to which Debian was installed
 -is not available any longer. You may want to consider to
 -recreate the directory '$INST_DIR' with
 +The partition on which Debian was installed is no
 +longer mounted. You may want to consider to recreate
 +the directory '$INST_DIR' (if necessary) with
  
 -mkdir "$INST_DIR"
 +if [ ! -d $INST_DIR ]; then mkdir "$INST_DIR"; fi
  
 -and add the line
 +and add the $intern_line_or_lines
  
 -/dev/mmcblk0p2  $INST_DIR  auto  defaults,async  0  0
 +$intern_fstablines
  
  to the file /etc/fstab, so it will be mounted with subsequent
  boots into the current system.
@@@ -1675,7 -1653,6 +1681,7 @@@
  EOINSTRUCTIONS
  	fi
  
 +	echo "I: Unmounting - done"
  	return 0
  }
  
@@@ -1768,19 -1745,18 +1774,19 @@@ d
  					exit 1
  				fi
  				action_all
 +				echo
  				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 [ -n "$VERBOSE" ]; echo "I: Invoking stage $i"; fi
  				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"
 +				if [ -n "$VERBOSE" ]; echo "I: Done with stage $i"; fi
  			fi
  			;;
                  *)

-- 
Various non-packaged files



More information about the pkg-fso-commits mailing list