Import patches-unapplied version 2.125 to ubuntu/saucy-proposed

Imported using git-ubuntu import. Changelog parent: 65b7f7a10a9bd05c60185f5c282af1a4c4efff57 New changelog entries: * live-build/auto/config: Add basic ubuntu-touch enablement (based on patch from Oliver Grawert, for which thanks). * live-build/auto/config, live-build/ubuntu-touch: Copy a huge pile of customisation by Ricardo Salveti from lp:~phablet-team/touch-preview-images/ubuntu-build-phablet, which should be close to enough for the architecture-independent parts of ubuntu-touch builds.
2025-11-04 10:54:07 +00:00 · 2013-05-01 12:05:41 -07:00 · 2013-05-01 12:05:41 -07:00 · f00349b766
commit f00349b766
parent 65b7f7a10a
30 changed files with 420 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,15 @@
+livecd-rootfs (2.125) saucy; urgency=low
+
+  * live-build/auto/config: Add basic ubuntu-touch enablement (based on
+    patch from Oliver Grawert, for which thanks).
+  * live-build/auto/config, live-build/ubuntu-touch: Copy a huge pile of
+    customisation by Ricardo Salveti from
+    lp:~phablet-team/touch-preview-images/ubuntu-build-phablet, which should
+    be close to enough for the architecture-independent parts of
+    ubuntu-touch builds.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 01 May 2013 12:05:41 -0700
+
 livecd-rootfs (2.124) raring; urgency=low

  * drop the namespace in mount options of ubuntu-touch-android.sh,
--- a/live-build/auto/config
+++ b/live-build/auto/config
@ -80,6 +80,7 @@ BINARY_IMAGES=none
 MEMTEST=none
 SOURCE='--source false'
 BOOTLOADER=none
+BOOTAPPEND_LIVE=
 LIVE_TASK=
 PREINSTALLED=false
 PREINSTALL_POOL=
@ -260,6 +261,19 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;

+	ubuntu-touch)
+		add_task install minimal ubuntu-touch
+		COMPONENTS='main restricted universe'
+		BINARY_IMAGES=tar
+		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
+		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
+		OPTS="${OPTS:+$OPTS }--apt-recommends false"
+		OPTS="${OPTS:+$OPTS }--binary-filesystem ext4"
+		OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
+		OPTS="${OPTS:+$OPTS }--swap-file-size 100"
+		OPTS="${OPTS:+$OPTS }--system normal"
+		;;
+
 	*)
 		echo "unknown project $PROJECT" >&2
 		exit 2
@ -330,7 +344,7 @@ case $ARCH in
 esac

 case $PROJECT in
-	ubuntu-server|ubuntu-core)
+	ubuntu-server|ubuntu-core|ubuntu-touch)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@ -374,6 +388,7 @@ lb config noauto \
 	--initsystem none \
 	--bootloader "$BOOTLOADER" \
 	--initramfs-compression lzma \
+	${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
 	$OPTS

 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
@ -432,6 +447,11 @@ deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
 EOF
 		fi
 		;;
+
+	ubuntu-touch)
+		cp -af /usr/share/livecd-rootfs/live-build/ubuntu-touch/* \
+			config/
+		;;
 esac

 # cribbed from cdimage, perhaps this should be a small helper script in germinate?
--- a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot
+++ b/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot
@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0ET3w4DgEEALUP5dk6tHWN0wBgONu56CAd16JFgihSA7J9U1nDurpL7IqcAf45Rw+7dqKk
+xqrb8B3RPRNdy4IF+acen54vGtkYkAMZNLh2BD045f4OlrMeVmxwM+SluTu3L2m/hPBDFbwA
+cOHKj6gMQ64roS6cEV9SMf6kjskRRMVNiofW16tZABEBAAG0JkxhdW5jaHBhZCBQUEEgZm9y
+IENhbm9uaWNhbCBRdDUgRWRnZXJziLgEEwECACIFAk98OA4CGwMGCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJENEQZREXlRiy1j0D/jXaGUmzxCku1wRqrt4ZtTN7cvJTXA/Olj4plcZT
+Cyxg7RmTvFgBeg5fJ6LzYRDiiDDTqVVW2xbZlLu6ig25dQYmHUJZUb1DPPMPbzm0w1yQna+D
+hhRzfHXa2Zo9U39wnYt6yjaljwZKnYcbDCsvTKyWyW9jx/YBCFUUg/SJPDF7
+=ZCi0
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot
+++ b/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/canonical-qt5-edgers/qt5-proper/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/canonical-qt5-edgers/qt5-proper/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/online-accounts-online-accounts-qt5-staging.key.chroot
+++ b/live-build/ubuntu-touch/archives/online-accounts-online-accounts-qt5-staging.key.chroot
@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUKaIjQEEAMRGtacMwxU39/mvV9OiNVzVh3nl5qiIukrW1z4qtxZ0sYjIYxm2OrRBzA2U
+3I/iZFkBPxjPLwJVDbkVjah6XE1qtMOYp3jhXXfEDP8ZhkeSxeYVlCI139oO3EFAWeHsmfEI
+pqjcToBz8tX58k0vjW0ucjYvmZeJQ1YPtp5ITwqhABEBAAG0IUxhdW5jaHBhZCBQUEEgZm9y
+IE9ubGluZSBBY2NvdW50c4i4BBMBAgAiBQJQpoiNAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
+AQIXgAAKCRChmfDmiU5Q4Db0BADBtvJUCF9x6pu9PD72crNaX+XvUqCnHGbXgAqd80i90fTu
+Z4cp6n1d81rmPRF3HUPVqUdNRGUrBvFlen2Rxzu8EoBjVZzuzrdF0u71HQakrkvLSTWgHKt+
+grZ3oDpj+3DJDTKYrLELaAT30lAiqG+FInQkZ+oMZDEwz18HL4EvfA==
+=VEFE
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/online-accounts-online-accounts-qt5-staging.list.chroot
+++ b/live-build/ubuntu-touch/archives/online-accounts-online-accounts-qt5-staging.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/online-accounts/online-accounts-qt5-staging/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/online-accounts/online-accounts-qt5-staging/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/phablet-team-ppa.key.chroot
+++ b/live-build/ubuntu-touch/archives/phablet-team-ppa.key.chroot
@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EURuvLgEEANJzP5/0OWTxF27fm/Z3pfBljaZtQobew1qjE/V6pygJDSM4975s8pjyEEyT
+bI0jCk7H32NWYLBDfgBn3I7F5yyh7EaWkBpdcuYm4pGmzybFm51AyU0EhENvVy3xrK3z09bU
+HnHzRnZ1FczhBU2ntv7eHBgVRteFVLFEKPFTSq2hABEBAAG0JUxhdW5jaHBhZCBQUEEgZm9y
+IFVidW50dSBQaGFibGV0IFRlYW2IuAQTAQIAIgUCURuvLgIbAwYLCQgHAwIGFQgCCQoLBBYC
+AwECHgECF4AACgkQXFNktV5RokymkgP/XMRKNNc2tdjFXX7tmrhEwI85zp/rrikfS8noERBt
+fB6U4ZR0LmCKfRW5RQRElUettMmV3tdHB9s2c/N5l/b9651IKf3EiZZDer26rCloCXNHLcjj
+mhh3icKf4qjDy3QhNN+lwPjVgJUbRlj/v7UwWGWmPJnu4b6F/snKuEpC5ds=
+=td4J
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/phablet-team-ppa.list.chroot
+++ b/live-build/ubuntu-touch/archives/phablet-team-ppa.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/phablet-team/ppa/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/phablet-team/ppa/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot
+++ b/live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot
@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUH8XrQEEALDyjXfN4zqPtDiEEdbAbOI0oGSbObbFJU5tgDlOBrVvPNRaNdl1LIu06pJ7
+PzJ+HItFiiaUtzPynv9BC7V7B3gIVaOs27nDqc4K1wHhA0Z2s+exsxKbRvkqPZ4cqIZeGDH0
+ysl0ab1QY+1zvvLP0o7WHPNObukskPVuEG46UHEZABEBAAG0H0xhdW5jaHBhZCBQUEEgZm9y
+IFN1cGVyIEZyaWVuZHOIuAQTAQIAIgUCUH8XrQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+F4AACgkQQL0bIXINpHkl/QP/bB66lkTCQj9oHaDmtGblbk8K95PPQHTzJnzywi4hcVNrvwvN
+bKjCP6PBJrUregq7OWrG1WLtPmL31wo55CeWdt3jI0qZqw1DnKwSXbZiFOLCigfKGm52v7MA
+YwUoCDbonTgG/T3gOA05EbkduVLOTd1jHw8nZfNkTz5uuL29GYo=
+=a6Bh
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot
+++ b/live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/super-friends/ppa/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/super-friends/ppa/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot
@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUOxoDQEEALOxcA9MBALWvQKz8Wo7kcpSgMfIBzLI3RI4Q+FpeeAJr5iHfwMVn1v9vhCa
+/ArUFBOcRIES4j/xmXt/DaFeZsyPZeFWKn1Z8IxUy/sdGqfmF0IUtsMap/Hp3jAFGcGUXKwP
+Wt51IxMzgMIE808nbCNv+wAoyZXYAotTm0g3XPLPABEBAAG0IUxhdW5jaHBhZCBQUEEgZm9y
+IFVidW50dSBTREsgdGVhbYi4BBMBAgAiBQJQ7GgNAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
+AQIXgAAKCRDxQbXwxxIvmzu5A/9BmZCUVSVGh5E1p5vHV4bEmuirJWN2GBJJ8tsg0MIiYSW8
+2Imm2lDmw7Am1HEc5ypKrtVuxHo5Q8bE/9NcYRWJhV0SlDkyJSt7W6RJAAdlKKQ610w4Kzi3
+sclZrZR3aCVCccMPCFwSgBUuYrR7OvQvYJdYRCygEDdg9qerHOo7ng==
+=eVbG
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ubuntu-sdk-team/ppa/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/ubuntu-sdk-team/ppa/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/ubuntu-touch-coreapps-drivers-daily.key.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-touch-coreapps-drivers-daily.key.chroot
@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUTiUDQEEAONRNDmy3fCoCeN8Kp+tKWmJJTuc1R1h/ze7yhCjIAAKNAZ4Bh5mcGcMS7cH
+KGspAYGSKrWSl0duDFWhC9iEDlUp6tBcFukWRyxqEbTL+C3zRnJPXidF9sza3L3AGazyAG+f
+FSP0hY6J5ZlwUabARHb89HbkzemlICeOjI1NAgXnABEBAAG0MExhdW5jaHBhZCBQUEEgZm9y
+IFVidW50dSBUb3VjaCBDb3JlIEFwcHMgRHJpdmVyc4i4BBMBAgAiBQJROJQNAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAyI5HsOCx0T9+xBADiSeBN/9dw0CHriYYgoNrDrYmx
+81mgLzNaP8T+kNbDBNNqpGo0TouFwqTIPfm0b2N/ykg8cb3LbyJhWN8rwTPUTIQhONPTPcXw
+dfL3KFCI8gx9OMS3HcnMgapa7nxpdIl/cxXaoA4uu4X4D/x3Fiv4+pkQZ8szFHdSjaBJYVmL
+9A==
+=Jy8V
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/ubuntu-touch-coreapps-drivers-daily.list.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-touch-coreapps-drivers-daily.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ubuntu-touch-coreapps-drivers/daily/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/ubuntu-touch-coreapps-drivers/daily/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot
@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.4
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaFvaiNCwzK
+7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD+1hw9xSvMXGO/dOa
+Zv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0MkxhdW5jaHBhZCBQUEEgZm9y
+IFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0ZWFtiLgEEwECACIFAlCiaeACGwMGCwkI
+BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gd
+a41lQsqLFXDWdYFaF1FqrLNa6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ
+22JNS5UIXmwSKO5PIx8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZ
+MByN
+=VBVL
+-----END PGP PUBLIC KEY BLOCK-----
--- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot
+++ b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot
@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main
--- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot
@ -0,0 +1,19 @@
+#!/bin/sh -x
+
+USER=phablet
+UGID=32011
+
+echo "I: creating default user $USER"
+adduser --gecos $USER --disabled-login $USER --uid $UGID
+
+echo "I: set user $USER password to $USER"
+echo "$USER:$USER" | chpasswd
+
+adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000
+
+mkdir -p /home/$USER/Music
+mkdir -p /home/$USER/Pictures
+mkdir -p /home/$USER/Videos
+mkdir -p /home/$USER/Downloads
+mkdir -p /home/$USER/Documents
+chown -R $UGID:$UGID /home/$USER
--- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
@ -0,0 +1,115 @@
+#!/bin/sh -x
+
+USER=phablet
+
+DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw"
+
+/bin/egrep  -i "^admin" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User admin exists in /etc/group"
+else
+   echo "User admin does not exists in /etc/group must create"
+   groupadd admin
+fi
+/bin/egrep  -i "^tty" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User tty exists in /etc/group"
+else
+   echo "User tty does not exists in /etc/group must create"
+   groupadd tty
+fi
+/bin/egrep  -i "^dialout" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User dialout exists in /etc/group"
+else
+   echo "User dialout does not exists in /etc/group must create"
+   groupadd dialout
+fi
+/bin/egrep  -i "^cdrom" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User cdrom exists in /etc/group"
+else
+   echo "User cdrom does not exists in /etc/group must create"
+   groupadd cdrom 
+fi
+/bin/egrep  -i "^plugdev" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User plugdev exists in /etc/group"
+else
+   echo "User plugdev does not exists in /etc/group must create"
+   groupadd plugdev
+fi
+/bin/egrep  -i "^audio" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User audio exists in /etc/group"
+else
+   echo "User audio does not exists in /etc/group must create"
+   groupadd audio
+fi
+/bin/egrep  -i "^dip" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User dip exists in /etc/group"
+else
+   echo "User dip does not exists in /etc/group must create"
+   groupadd dip
+fi
+/bin/egrep  -i "^video" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User video exists in /etc/group"
+else
+   echo "User video does not exists in /etc/group must create"
+   groupadd video
+fi
+/bin/egrep  -i "^adm" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User adm exists in /etc/group"
+else
+   echo "User adm does not exists in /etc/group must create"
+   groupadd adm
+fi
+/bin/egrep  -i "^android_net" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User android_net exists in /etc/group"
+else
+   echo "User android_net does not exist in /etc/group -- must create"
+   groupadd -g 3003 android_net
+fi
+/bin/egrep -i "^android_net2" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User android_net2 exists in /etc/group"
+else
+	echo "User android_net2 does not exist in /etc group -- must create"
+	groupadd -g 3004 android_net2
+fi
+/bin/egrep -i "^android_net3" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User android_net3 exists in /etc/group"
+else
+	echo "User android_net3 does not exist in /etc group -- must create"
+	groupadd -g 3002 android_net3
+fi
+/bin/egrep -i "^android_graphics" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User android_graphics exists in /etc/group"
+else
+	echo "User android_graphics does not exist in /etc group -- must create"
+	groupadd -g 1003 android_graphics
+fi
+/bin/egrep -i "^android_input" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User android_input exists in /etc/group"
+else
+	echo "User android_input does not exist in /etc group -- must create"
+	groupadd -g 1004 android_input
+fi
+/bin/egrep -i "^sdcard_rw" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User sdcard_rw exists in /etc/group"
+else
+	echo "User sdcard_rw does not exist in /etc group -- must create"
+	groupadd -g 1015 sdcard_rw 
+fi
+
+echo "I: add $USER to ($DEFGROUPS) groups"
+usermod -a -G ${DEFGROUPS} ${USER}
+
--- a/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot
+++ b/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot
@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "Adding admin group policy to NM system service"
+
+sed -i 's/<policy user="root">/<policy group="admin">\n\t\t\t\t<allow send_destination="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager.SecretAgent"\/>\n\t\t<\/policy>\n\t\t<policy user="root">/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+
--- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot
+++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "I: setting up initial environment for Touch..."
+
+echo "HOSTNAME=android
+SHELL=/system/bin/sh
+TERM=linux
+ANDROID_CACHE=/cache
+LOOP_MOUNTPOINT=/mnt/obb
+ASEC_MOUNTPOINT=/mnt/asec
+ANDROID_PROPERTY_WORKSPACE=8,49152
+ANDROID_ASSETS=/system/app
+ANDROID_BOOTLOGO=1
+LD_LIBRARY_PATH=/vendor/lib:/system/lib
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ANDROID_DATA=/data
+QT_QPA_PLATFORM=ubuntu
+QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports
+SHLVL=1
+MKSH=/system/bin/sh
+ANDROID_ROOT=/system
+EXTERNAL_STORAGE=/mnt/sdcard
+LANG=en_US.UTF-8
+LANGUAGE=en_US:en
+QT_IM_MODULE=maliit
+HUD_NO_STORE_USAGE_DATA=1
+INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment
+
+echo -e "\n# export the phablet shell dbus session on normal login shells
+source /home/phablet/.dbus-session
+export DBUS_SESSION_BUS_ADDRESS" >> /home/phablet/.bashrc
--- a/live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot
+++ b/live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot
@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Extract pictures to user
+tar -C /home/phablet/Pictures/ --strip-components=1 -xzf \
+    /usr/share/demo-assets/pictures.tgz
+chown -R phablet:phablet /home/phablet/Pictures
+
+# Copy videos to user
+cp -p /usr/share/demo-assets/videos/* /home/phablet/Videos/
+chown -R phablet:phablet /home/phablet/Videos
+
+# Set up fake telepathy-logger data
+mkdir -p /home/phablet/.local/share/TpLogger/logs
+cp -aRp /usr/share/demo-assets/telephony-app/* /home/phablet/.local/share/TpLogger/logs
+chown -R phablet.phablet /home/phablet/.local/
--- a/live-build/ubuntu-touch/hooks/99-remove-documentation.chroot
+++ b/live-build/ubuntu-touch/hooks/99-remove-documentation.chroot
@ -0,0 +1,11 @@
+#!/bin/bash
+
+# remove-documentation: Remove unnecessary documentation to reduce disk usage
+#
+# Author: Alex Chiang <achiang@canonical.com>
+# Date  : November 9, 2010
+
+echo "Removing documentation..."
+find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true
+find /usr/share/doc -empty|xargs rmdir || true
+rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man
--- a/live-build/ubuntu-touch/includes.chroot/etc/default/locale
+++ b/live-build/ubuntu-touch/includes.chroot/etc/default/locale
@ -0,0 +1 @@
+LANG="en_US.UTF-8"
--- a/live-build/ubuntu-touch/includes.chroot/etc/hostname
+++ b/live-build/ubuntu-touch/includes.chroot/etc/hostname
@ -0,0 +1 @@
+ubuntu-phablet
--- a/live-build/ubuntu-touch/includes.chroot/etc/hosts
+++ b/live-build/ubuntu-touch/includes.chroot/etc/hosts
@ -0,0 +1,10 @@
+127.0.0.1	localhost.localdomain	localhost
+::1	ubuntu-phablet	localhost6.localdomain6	localhost6
+127.0.1.1	ubuntu-phablet
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
--- a/live-build/ubuntu-touch/package-lists/README
+++ b/live-build/ubuntu-touch/package-lists/README
@ -0,0 +1,2 @@
+# Package lists that exist in this directory need
+# to have a .list.chroot suffix in order to be processed.
--- a/live-build/ubuntu-touch/package-lists/apps.list.chroot
+++ b/live-build/ubuntu-touch/package-lists/apps.list.chroot
@ -0,0 +1,19 @@
+hud
+qtubuntu
+qt5-default
+qtchooser
+qtdeclarative5-ubuntu-ui-toolkit-plugin
+webbrowser-app
+camera-app
+gallery-app
+phone-app
+mediaplayer-app
+notes-app
+libandroid-audiosystem-asound2
+demo-assets
+webapps-demo
+share-app
+ubuntu-calendar-app
+ubuntu-calculator-app
+ubuntu-clock-app
+ubuntu-weather-app
--- a/live-build/ubuntu-touch/package-lists/core.list.chroot
+++ b/live-build/ubuntu-touch/package-lists/core.list.chroot
@ -0,0 +1,37 @@
+libhybris
+libhybris-test
+isc-dhcp-client
+net-tools
+network-manager
+bluez
+ca-certificates
+alsa-base
+alsa-utils
+ttf-ubuntu-font-family
+fonts-freefont-ttf
+ttf-dejavu-extra
+dbus-x11
+ubuntu-session
+chewie
+powerd
+language-pack-en
+maliit-framework
+maliit-keyboard
+maliit-keyboard-data
+friends
+friends-facebook
+friends-twitter
+telepathy-gabble
+libmessaging-menu0
+signon-plugin-oauth2
+python3-gi
+python3-pkg-resources
+python3-oauthlib
+gir1.2-accounts-1.0
+account-plugin-tools
+account-plugin-twitter
+account-plugin-facebook
+libqtfolks1
+ubuntu-mobile
+ubuntu-qtlocation-plugin
+software-properties-common
--- a/live-build/ubuntu-touch/package-lists/debug.list.chroot
+++ b/live-build/ubuntu-touch/package-lists/debug.list.chroot
@ -0,0 +1,3 @@
+nano
+iputils-ping
+wireless-tools
--- a/live-build/ubuntu-touch/package-lists/shell.list.chroot
+++ b/live-build/ubuntu-touch/package-lists/shell.list.chroot
@ -0,0 +1,10 @@
+qml-phone-shell
+indicators-client
+indicators-client-plugin-sound
+indicators-client-plugin-network
+indicators-client-plugin-messaging
+indicators-client-plugin-power
+indicators-client-plugin-datetime
+indicators-client-examples
+unity-lens-people
+unity-lens-applications