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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 23ca7b95f3069b35c9e0247362060590058374a4
Merge: 840b74277ff5fa6b7eaeeb19640fb0bacf5e62a7 12d6aae4a54a55ca456e16ac58963f4579f7224f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 11 17:11:42 2011 +0200

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

diff --combined install.sh
index af08735,2391762..5084026
--- a/install.sh
+++ b/install.sh
@@@ -98,8 -98,8 +98,8 @@@ intern_no_partitioning="
  # with packages for a basic debian with network connectivity
  CDEBOOTSTRAP_FLAVOUR=minimal
  DEBOOTSTRAP_VARIANT=minbase
 -CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.7_armel.deb
 -DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.32_all.deb
 +CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.8_armel.deb
 +DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.36_all.deb
  CDEBOOTSTRAP_EXTRA_PACKAGES=
  DEBOOTSTRAP_EXTRA_PACKAGES=install-info
  # This gets passed to boot strappers. currently not used
@@@ -113,7 -113,7 +113,7 @@@ DEBIAN_EXTRA_PACKAGES=ifupdown,dropbear
  # 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 \
- console-setup xserver-xorg-core xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils"
+ console-setup xserver-xorg-core xserver-xorg-video-glamo xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils"
  
  # well-suited software for the FreeRunner
  PACKAGES_TASK_AUDIO="intone"
@@@ -1204,15 -1204,61 +1204,61 @@@ action_configuration () 
  
  	echo " * Creating /etc/X11/xorg.conf"
  	cat > "$INST_DIR/etc/X11/xorg.conf" <<__END__
- # Xorg confiugration for an Openmoko FreeRunner
+ # Xorg configuration for an Openmoko FreeRunner
+ 
+ Section "Module"
+        Load    "glx"
+        Load    "dri2"
+ EndSection
+ 
+ Section "Monitor"
+        Identifier      "LCD Panel"
+ EndSection
  
  Section "Device"
- 	Identifier	"Configured Video Device"
- 	Driver		"fbdev"
+        Identifier      "Glamo Graphics Chip"
+        Driver          "glamo"
  EndSection
  
- # complementary information on the touch screen as the
- # input device is provided by udev
+ Section "Screen"
+        Identifier      "Default Screen"
+        Device          "Glamo Graphics Chip"
+        Monitor         "LCD Panel"
+ EndSection
+ 
+ Section "InputDevice"
+        Identifier      "Power Button"
+        Driver          "evdev"
+        Option          "Device"        "/dev/input/event0"
+ EndSection
+ 
+ 
+ Section "InputDevice"
+        Identifier      "AUX Button"
+        Driver          "evdev"
+        Option          "Device"        "/dev/input/event2"
+ EndSection
+ 
+ 
+ Section "InputDevice"
+        Identifier      "Touchscreen"
+        Driver          "evdev"
+        Option          "Device"        "/dev/input/event1"
+        Option          "Calibration"  "107 918 911 98"
+        Option          "SwapAxes"     "On"
+ EndSection
+ 
+ Section "ServerFlags"
+        Option "AutoAddDevices" "False"
+ EndSection
+ 
+ Section "ServerLayout"
+        Identifier      "Default Layout"
+        Screen          "Default Screen"
+        InputDevice     "Power Button"
+        InputDevice     "AUX Button"
+        InputDevice     "Touchscreen"
+ EndSection
  
  __END__
  
@@@ -1455,7 -1501,7 +1501,7 @@@ EO
  	else
  		ensure_proc_is_mounted
  
- 		intern_cmd="apt-get $APT_OPTIONS install linux-image-2.6.29-openmoko-gta02"
+ 		intern_cmd="apt-get $APT_OPTIONS install linux-image-2.6.34-openmoko-gta02"
  
  		if [ "$SD_PART1_FS" = "vfat" ]; then
  			intern_bootmountpoint=$(mount | grep "^${SD_DEVICE}p1"| cut -f3 -d\ )

-- 
Various non-packaged files