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

[Luca Capello]

The following commit has been merged in the master branch:
commit d026c4f11d16f2d81f3baf272ae0e22f0d04134a
Author: Luca Capello <luca at pca.it>
Date:   Mon Nov 10 21:03:06 2008 +0100

    install.sh: add user variable FSO_DEVICE (fso-config-gta02)

diff --git a/install.sh b/install.sh
index 24343d1..1563a68 100755
--- a/install.sh
+++ b/install.sh
@@ -35,6 +35,14 @@ INST_MIRROR=${INST_MIRROR:-http://ftp2.de.debian.org/debian}
 APT_RECOMMENDS=${APT_RECOMMENDS:-false}
 DASH_BINSH=${DASH_BINSH:-true}
 FSO_MIRROR=${FSO_MIRROR:-http://pkg-fso.alioth.debian.org/debian}
+FSO_DEVICE=${FSO_DEVICE:-gta02}
+
+### sanity check until the GTA01 installer will be merged
+if [ "${FSO_DEVICE}" != gta02 ]; then
+    echo "Installing on anything different than the Openmoko"
+    echo "GTA02 Neo FreeRunner is not supported yet."
+    exit 1
+fi
 
 # general variables
 VERSION=1.1
@@ -142,6 +150,8 @@ Variables:
                    possible values are true/false)
   FSO_MIRROR       the Debian FSO repository (default to
                    http://pkg-fso.alioth.debian.org/debian)
+  FSO_DEVICE       the device the installation is being performed on
+                   (default to gta02, possible value is gta02 only)
 
 
 Stages:
@@ -461,12 +471,10 @@ configuration)
 #
 # Stage configuration
 #
-echo "Configuring system files"
+echo "Configuring system files for ${FSO_DEVICE}"
 
-echo " * Creating /etc/pointercal for the touchscreen"
-cat > $INST_DIR/etc/pointercal <<__END__
-557 38667 -4654632 -51172 121 46965312 65536
-__END__
+echo " * Installing the fso-config-${FSO_DEVICE} package"
+chroot $INST_DIR apt-get --yes --force-yes install fso-config-${FSO_DEVICE}
 
 echo " * Creating /etc/X11/xorg.conf"
 cat > $INST_DIR/etc/X11/xorg.conf <<__END__

-- 
Various non-packaged files