Import patches-unapplied version 2.301 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 35251d626be197aae93c082c48ffc67dad49ed42

New changelog entries:
  [ Michael Vogt ]
  * create /boot/uboot on armhf to ensure that its in the system
    tarball and still on the system if ubuntu-core-upgrader
    performs a "format" (LP: #1447652)
  * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
    - fix typo in hardware.yaml
  * live-build/auto/config:
    - add grub-efi-ia32-bin for i386 for efi support
  [ Adam Conrad ]
  * live-build/auto/config: Handle applying priorities to EXTRA_PPAS
    via the extra_ppa="user/ppaname:priority" syntax (LP: #1450257)

debian/changelog

@@ -1,3 +1,20 @@
+livecd-rootfs (2.301) wily; urgency=low
+
+  [ Michael Vogt ]
+  * create /boot/uboot on armhf to ensure that its in the system
+    tarball and still on the system if ubuntu-core-upgrader
+    performs a "format" (LP: #1447652)
+  * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
+    - fix typo in hardware.yaml
+  * live-build/auto/config:
+    - add grub-efi-ia32-bin for i386 for efi support
+
+  [ Adam Conrad ]
+  * live-build/auto/config: Handle applying priorities to EXTRA_PPAS
+    via the extra_ppa="user/ppaname:priority" syntax (LP: #1450257)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 06 May 2015 18:23:17 -0600
+
 livecd-rootfs (2.300) vivid; urgency=medium
 
   * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: revert

live-build/auto/config

@@ -383,6 +383,11 @@ case $PROJECT in
                                 # specific device tarfile is created
                                 add_package install walinuxagent
                                 ;;
+                            i386)
+                                # efi support can go once the task
+                                # header is available for grub-efi-ia32-bin
+                                add_package install grub-efi-ia32-bin
+                                ;;
                         esac
 
                         # generic kernel etc
@@ -659,6 +664,7 @@ esac
 
 if [ "$EXTRA_PPAS" ]; then
 	rm -f config/archives/extra-ppas.list.chroot \
+	      config/archives/extra-ppas.pref.chroot \
 	      config/archives/extra-ppas.key.chroot
 	gpg_tmpdir="$(mktemp -d)"
 	run_gpg () {
@@ -668,8 +674,23 @@ if [ "$EXTRA_PPAS" ]; then
 			"$@"
 	}
 	for extra_ppa in $EXTRA_PPAS; do
+		extra_ppa_pin=''
+		extra_ppa_origin=''
+		case $extra_ppa in
+		    *:*)
+			extra_ppa_pin=${extra_ppa#*:}
+			extra_ppa=${extra_ppa%:*}
+			;;
+		esac
 		extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
 		echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot
+		if [ -n "$extra_ppa_pin" ]; then
+		    extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"
+		    echo "Package: *" >> config/archives/extra-ppas.pref.chroot
+		    echo "Pin: release o=$extra_ppa_origin" >> config/archives/extra-ppas.pref.chroot
+		    echo "Pin-Priority: $extra_ppa_pin" >> config/archives/extra-ppas.pref.chroot
+		    echo "" >> config/archives/extra-ppas.pref.chroot
+		fi
 		run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
 			--recv "$extra_ppa_fingerprint"
 		run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
@@ -694,6 +715,10 @@ if [ "$EXTRA_PPAS" ]; then
 	      config/archives/extra-ppas.list.binary
 	cp -a config/archives/extra-ppas.key.chroot \
 	      config/archives/extra-ppas.key.binary
+	if [ -f config/archives/extra-ppas.pref.chroot ]; then
+		cp -a config/archives/extra-ppas.pref.chroot \
+		      config/archives/extra-ppas.pref.binary
+	fi
 fi
 
 case $SUBPROJECT in

live-build/ubuntu-core/hooks/16-ensure-uboot.chroot

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(dpkg --print-architecture)" = "armhf" ]; then
+    mkdir -p /boot/uboot
+fi

live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary

@@ -45,7 +45,7 @@ mkdir -p $TMPDIR/assets/
  cat > $TMPDIR/hardware.yaml << EOF
 kernel: assets/vmlinuz
 initrd: assets/initrd.img
-partiton-layout: system-AB
+partition-layout: system-AB
 EOF
 
 # arch specific ones