Merge from trunk

debian/changelog

@@ -1,3 +1,29 @@
+livecd-rootfs (2.171) saucy; urgency=low
+
+  * seems unlike my local build the buildd doesnt get along with links, use
+    copy instead
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 07 Aug 2013 21:56:07 +0200
+
+livecd-rootfs (2.170) saucy; urgency=low
+
+  * fix package mirror in android package install routine
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 07 Aug 2013 19:17:43 +0200
+
+livecd-rootfs (2.169) saucy; urgency=low
+
+  * switch touch builds to use the packaged android img files (pending cdimage
+    changes to publish these from the livefs builder)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 07 Aug 2013 16:05:45 +0200
+
+livecd-rootfs (2.168) saucy; urgency=low
+
+  * drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 01 Aug 2013 19:11:55 +0200
+
 livecd-rootfs (2.167) saucy; urgency=low
 
   * make sure FLASH_KERNEL_SKIP is set when we post-process touch images

live-build/auto/build

@@ -414,8 +414,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 	sourceslist="chroot/etc/apt/sources.list"
 
-	export FLASH_KERNEL_SKIP=True
-
 	lb chroot_proc install "$@"
 	lb chroot_sysfs install "$@"
 	lb chroot_devpts install "$@"
@@ -429,20 +427,22 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 	mv "${sourceslist}" "${sourceslist}.orig"
 	mv "${sourceslist}.d" "${sourceslist}.d.orig"
-	echo "deb http://ftpmaster.internal/ubuntu/ saucy main universe" >$sourceslist
+	echo "deb $LB_PARENT_MIRROR_CHROOT saucy main universe multiverse restricted" >$sourceslist
 	Chroot chroot "apt-get -y update"
-	Chroot chroot "apt-get -y install ubuntu-touch-generic-initrd"
+	Chroot chroot "apt-get -y install android"
 
+	REL="$LB_DISTRIBUTION"
 	for subarch in $touchsubarches; do
-		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|awk '/Depends: linux-image/ {print $2}')"
-		kver=${kpkg#linux-image-}
-		Chroot chroot "apt-get -y install $kpkg"
-
-		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
-		initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
-
-		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
+		cp "chroot/usr/share/android/product/${REL}-preinstalled-system-armel+${subarch}.img"\
+			 "${PREFIX}.system-armel+${subarch}.img"
+		cp "chroot/usr/share/android/product/${REL}-preinstalled-recovery-armel+${subarch}.img"\
+			 "${PREFIX}.recovery-armel+${subarch}.img"
+		cp "chroot/usr/share/android/product/${REL}-preinstalled-boot-armhf+${subarch}.img"\
+			 "${PREFIX}.boot-armhf+${subarch}.img"
+		# drop this following line once cdimage can handle -boot-*.img
+		cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
+		cp "chroot/usr/share/android/product/${REL}-preinstalled-touch-armel+${subarch}.zip"\
+			 "${PREFIX}.armel+${subarch}.zip"
 	done
 
 	lb chroot_devpts remove "$@"

live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot

@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaF
-vaiNCwzK7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD
-+1hw9xSvMXGO/dOaZv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0
-MkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0
-ZWFtiLgEEwECACIFAlCiaeACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
-EEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gda41lQsqLFXDWdYFaF1FqrLNa
-6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ22JNS5UIXmwSKO5P
-Ix8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZMByN
-=VBVL
------END PGP PUBLIC KEY BLOCK-----

live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot

@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main
-# deb-src http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main