From 5484289aa59d52807c35a672ebdf1fb03fa2f704 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Fri, 22 Aug 2008 18:11:52 +1000
Subject: [PATCH] * Add support for building Ubuntu MID images.     - Includes
 changing the kernel name for lpia due to the lack of meta       package for
 the time being.

---
 debian/changelog |  8 ++++++++
 livecd.sh        | 24 +++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b53b4c6..0a426a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (0.64) intrepid; urgency=low
+
+  * Add support for building Ubuntu MID images.
+    - Includes changing the kernel name for lpia due to the lack of meta
+      package for the time being.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 22 Aug 2008 18:10:38 +1000
+
 livecd-rootfs (0.63) intrepid; urgency=low
 
   * Do not install xresprobe, it is not necessary any more and in universe
diff --git a/livecd.sh b/livecd.sh
index c20e1d44..33b0ba62 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -73,7 +73,7 @@ select_mirror () {
     case $ARCH in
 	i386|amd64)
 	    case $FS in
-		ubuntu-lpia)
+		ubuntu-lpia|ubuntu-mid)
 		    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
 		    SECMIRROR=${USERMIRROR}
 		    SECSRCMIRROR=${SRCMIRROR}
@@ -139,7 +139,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-	ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|base|tocd)
+	ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -198,6 +198,11 @@ Flags: seen
 	    LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper"
 	    COMP="main"
 	    ;;
+    ubuntu-mid)
+        LIST="$LIST minimal^ ubuntu-mid casper xserver-xorg-input-evtouch usplash"
+        LIVELIST=""
+        COMP="main restricted universe multiverse"
+        ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper lupin-casper"
@@ -296,7 +301,7 @@ link_in_boot = $link_in_boot
 	i386)		LIST="$LIST linux-generic";;
 
 	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-lpia";;
+	lpia)		LIST="$LIST linux-image-2.6.26-1-lpia";;
 	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;
@@ -304,6 +309,19 @@ link_in_boot = $link_in_boot
 	*)		echo "Unknown architecture: no kernel."; exit 1;;
     esac
 
+    if [ $FS = "ubuntu-mid" ]; then
+      case "$SUBARCH" in
+        *proprietary*)
+          case "$SUBARCH" in
+            menlow*)
+              LIST="$LIST marvell-8686-firmware-9 psb-video libgl1-mesa-dri-psb xorg-modules-xpsb"
+              ;;
+          esac
+          LIST="$LIST mobile-usb-client-utils mobile-usb-host-utils"
+          ;;
+      esac
+    fi
+
     for x in $EXCLUDE; do
 	LIST="$(without_package "$x" "$LIST")"
     done