* Luca once sent instructions around about how to submit patches to install.sh. 0001 renders those instructions more patcher-proof and anchors them in the source * 0002 encourages the user to use the Debian kernel for the boot partition. The patch probably goes to the wrong place, but you know what I mean. * 0003 adds the minimal config for the fbpanel from the openmoko wiki page. I don't really care for what is done, but the straight zhone purely is somehow not so nice. You may have better ideas on what is out there. * 0004 will format vfat or ext2 and also may add a swap partition.
I need to think more about 0004 and the consequences this has....tomorrow Steffen
>From b1e4d1b2f0b48a3d9f89d9100e53345a5a328985 Mon Sep 17 00:00:00 2001 From: Steffen Moeller <[email protected]> Date: Thu, 12 Feb 2009 23:23:42 +0100 Subject: [PATCH] Helping the world that blindly follows instructions on http://wiki.debian.org/DebianOnFreeRunner with explicit instructions on how to feed back changes. --- install.sh | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/install.sh b/install.sh index 880f4bb..89371d6 100755 --- a/install.sh +++ b/install.sh @@ -19,6 +19,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# This file is maintained in the pkg-fso git repository. To contribute, +# check it out with +# git clone git://git.debian.org/pkg-fso/files.git +# perform your changes and prepare patches with +# git format-patch origin/master +# to send to the authors or to the pkg-fso mailing list +# [email protected] . + set -e -- 1.5.6.5
>From 865dcafc9ef910746dd5420de9381d9c7b6ac464 Mon Sep 17 00:00:00 2001 From: Steffen Moeller <[email protected]> Date: Thu, 12 Feb 2009 23:35:56 +0100 Subject: [PATCH] Gave instructions on how to use install.sh with a vfat first partition. --- install.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/install.sh b/install.sh index 89371d6..7d9e0fb 100755 --- a/install.sh +++ b/install.sh @@ -242,7 +242,10 @@ Because dpkg, the Debian package manager, does not support non-POSIX filesystems, the Debian kernel package can not be installed. More information are available at http://bugs.debian.org/315493. -Thus, you should continue at your own risk. +Thus, you should continue at your own risk. You can still use Debian's +kernel for the OpenMoko, just don't mount your vfat boot partition to /boot +yet. Install the regular kernel package, then manually copy /boot/uImage.bin +to your first partition. Don't create any subfolders. Press any key within 5 seconds to quit __END__ -- 1.5.6.5
>From 1d74bb83dac1fc1d852bc3165f3265d548d49842 Mon Sep 17 00:00:00 2001 From: Steffen Moeller <[email protected]> Date: Fri, 13 Feb 2009 00:27:58 +0100 Subject: [PATCH] Allowing another (more user-friendly) window manager than the default zhone-only user interface. --- install.sh | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 7d9e0fb..d6fceb5 100755 --- a/install.sh +++ b/install.sh @@ -47,6 +47,7 @@ FSO_DEVICE=${FSO_DEVICE:-gta02} QI=${QI:-false} QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false} SINGLE_PART=${SINGLE_PART:-$QI} +WINDOW_MANAGER=${WINDOW_MANAGER:-zhone} ### sanity check until the GTA01 installer will be merged if [ "${FSO_DEVICE}" != gta02 ]; then @@ -174,6 +175,9 @@ Variables: do this only when QI=true (default to false) SINGLE_PART set this to true if only one partition should be created this is true by default for QI=true and false if SD_PART1_FS=vfat + WINDOW_MANAGER the presentation of the phone to the user. The default is + to just use the 'zhone' (phone) application. Alternatively, + 'fbpanel' is a tiny but usable window manager. Stages: @@ -672,14 +676,37 @@ if [ -f "$WPA_SUPPLICANT_CONF" ]; then fi echo " * Installing /root/.xsession" -cat > $INST_DIR/root/.xsession <<__END__ +case $WINDOW_MANAGER in +fbpanel) + # from http://wiki.openmoko.org/wiki/Debian#Matchbox_with_fbpanel + apt-get -yes install fbpanel + cat > $INST_DIR/root/.xsession <<__END__ +#!/bin/sh +export GTK_MODULES=libgtkstylus.so +zhone & +xsetroot -solid black +matchbox-keyboard-toggle & +matchbox-window-manager -use_titlebar yes & +# -use_titlebar yes to minimize & toggle between apps +# fbpanel's taskbar does not work with matchbox-window-manager +#~/bin/auxlaunch & +while true; +do +fbpanel; +sleep 1; +done; +__END__ + +*) + cat > $INST_DIR/root/.xsession <<__END__ #!/bin/sh trayer --edge top & openmoko-panel-plugin & zhone & exec matchbox-window-manager -use_titlebar no -use_cursor no __END__ - + ;; +esac echo "I: System configured" ;; -- 1.5.6.5
>From 6834aca5e0a66ab795daae472356ccc3c2b5edae Mon Sep 17 00:00:00 2001 From: Steffen Moeller <[email protected]> Date: Fri, 13 Feb 2009 02:38:37 +0100 Subject: [PATCH] Added formatting of vfat systems, prepared swap partition. --- install.sh | 84 +++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 55 insertions(+), 29 deletions(-) diff --git a/install.sh b/install.sh index d6fceb5..9a8431e 100755 --- a/install.sh +++ b/install.sh @@ -38,6 +38,8 @@ set -e HOSTNAME=${HOSTNAME:-debian-gta02} SD_DEVICE=${SD_DEVICE:-/dev/mmcblk0} SD_PART1_FS=${SD_PART1_FS:-ext2} +SD_PART1_SIZE=${SD_PART1_SIZE:-8} +SD_SWAP_SIZE=${SD_SWAP_SIZE:-0} INST_DIR=${INST_DIR:-/mnt/debian} INST_MIRROR=${INST_MIRROR:-http://ftp2.de.debian.org/debian} APT_RECOMMENDS=${APT_RECOMMENDS:-false} @@ -155,6 +157,8 @@ Variables: SD_PART1_FS the filesystem for the first microSD card partition, i.e. the one containing the uImage.bin (default to ext2, possible values are ext2/vfat) + SD_PART1_SIZE number of megapytes for first partition (default $SD_PART1_SIZE) + SD_SWAP_SIZE number of megabytes of swap partition (default $SD_SWAP_SIZE) INST_DIR the directory where the microSD card partitions will be mounted to (default to /mnt/debian) INST_MIRROR the Debian mirror used during installation, it @@ -390,46 +394,68 @@ umount_all # put the partition table in a "known state" dd if=/dev/zero of=$SD_DEVICE bs=512 count=1 + # run partitioner -if [ "$SD_PART1_FS" = "vfat" ]; then +rootpartno=2 +bootfstypeno=83 +if [ "vfat" = "$SD_PART1_FS" ]; then + bootfstypeno=4 +fi + +if [ "$SINGLE_PART" = "true" ]; then fdisk $SD_DEVICE <<__END__ n p 1 -+8M -t -4 -n -p -2 - -w __END__ -elif [ "$SINGLE_PART" = "true" ]; then - fdisk $SD_DEVICE <<__END__ -n -p -1 + if [ -n "$SD_SWAP_SIZE" ]; then + echo "Preparation of swap partition is not supported for single part setups." + fi -w -__END__ else - fdisk $SD_DEVICE <<__END__ + cat <<EOBOOTCONF > /tmp/argsToFdisk$$ n p 1 -+8M ++${SD_PART1_SIZE}M +t +$bootfstypeno +EOBOOTCONF + + if [ 0 -lt "$SD_SWAP_SIZE" ]; then + rootpartno=3 + cat <<EOSWAPCONF >> /tmp/argsToFdisk$$ n p 2 ++${SD_SWAP_SIZE}M +t +82 +EOSWAPCONF + fi + + cat <<EOROOTCONF >> /tmp/argsToFdisk$$ +n +p +$rootpartno + w -__END__ +EOROOTCONF + + if fdisk $SD_DEVICE < /tmp/argsToFdisk$$; then + echo "Partitioning was successful." + #rm /tmp/argsToFdisk$$ + else + echo "Partitioning failed, could not execute with fdisk:" + cat /tmp/argsToFdisk$$ + exit -1 + fi fi echo " * Waiting for partitions to appear" @@ -676,11 +702,10 @@ if [ -f "$WPA_SUPPLICANT_CONF" ]; then fi echo " * Installing /root/.xsession" -case $WINDOW_MANAGER in -fbpanel) +if [ "fbpanel" = "$WINDOW_MANAGER" ]; then # from http://wiki.openmoko.org/wiki/Debian#Matchbox_with_fbpanel apt-get -yes install fbpanel - cat > $INST_DIR/root/.xsession <<__END__ + cat > $INST_DIR/root/.xsession <<EOFBPANEL #!/bin/sh export GTK_MODULES=libgtkstylus.so zhone & @@ -695,18 +720,19 @@ do fbpanel; sleep 1; done; -__END__ - -*) - cat > $INST_DIR/root/.xsession <<__END__ +EOFBPANEL + +else + + cat > $INST_DIR/root/.xsession <<EOZHONE #!/bin/sh trayer --edge top & openmoko-panel-plugin & zhone & exec matchbox-window-manager -use_titlebar no -use_cursor no -__END__ - ;; -esac +EOZHONE + +fi echo "I: System configured" ;; -- 1.5.6.5
_______________________________________________ pkg-fso-maint mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-fso-maint
