Initial support for raspi2 subarch.

debian/changelog

@@ -1,4 +1,4 @@
-livecd-rootfs (2.376ubuntu1) UNRELEASED; urgency=medium
+livecd-rootfs (2.376) UNRELEASED; urgency=medium
 
   [ Michael Terry ]
   * Change real name for phablet user to "Ubuntu" in ubuntu-touch.
@@ -39,6 +39,7 @@ livecd-rootfs (2.376ubuntu1) UNRELEASED; urgency=medium
   * Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs via
     live-build and reuse this for the tarball, instead of lb_binary_rootfs
     creating some artifact that we ignore / throw away.
+  * Initial support for raspi2 subarch.
 
  -- Ben Howard <ben.howard@ubuntu.com>  Sun, 07 Feb 2016 16:59:41 -0700
 

live-build/auto/config

@@ -562,6 +562,11 @@ case $ARCH in
 				echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot
 				echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot
 				;;
+			raspi2)
+				COMPONENTS='main restricted universe'
+				add_package install raspberrypi2-firmware u-boot-rpi flash-kernel u-boot-tools
+				BINARY_REMOVE_LINUX=false
+				;;
 		esac
 		;;
 esac
@@ -625,6 +630,80 @@ echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
 echo "BUILDSTAMP=\"$NOW\"" >> config/binary
 
+case $ARCH+$SUBARCH in
+	armhf+raspi2)
+		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
+#!/bin/sh -ex
+mkdir -p /boot/firmware
+EOF
+		cat > config/hooks/999-raspi2-fixes.chroot <<EOF
+#!/bin/sh -ex
+cat >> /etc/fstab << EOM
+LABEL=system-boot       /boot/firmware  vfat    defaults        0       1
+EOM
+
+cat > /boot/firmware/cmdline.txt << EOM
+elevator=deadline
+EOM
+
+cat > /boot/firmware/config.txt << EOM
+# For more options and information see 
+# http://www.raspberrypi.org/documentation/configuration/config-txt.md
+# Some settings may impact device functionality. See link above for details
+
+kernel=uboot.bin
+
+# enable i2c
+dtparam=i2c_arm=on
+dtparam=spi=on
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+EOM
+EOF
+		;;
+	*)
+		;;
+esac
+
 case $PROJECT in
 	ubuntu-server)
 		cat > config/hooks/100-remove-fstab.chroot <<EOF

live-build/ubuntu-cpc/hooks/032-disk-image.binary

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash -ex
 
 . /build/config/functions
 
@@ -7,11 +7,19 @@ BOOTPART_END=
 BOOT_MOUNTPOINT=
 ROOTPART_START=1
 
-case $ARCH in
+case $ARCH:$SUBARCH in
-	ppc64el)
+	ppc64el:*)
 		echo "ppc64el disk images are handled separately"
 		exit 0
 		;;
+	armhf:raspi2)
+		# matches the size of the snappy image
+		IMAGE_SIZE=$((4*1000*1000*1000))
+
+		BOOTPART_START=8192s
+		BOOTPART_END=138M
+		BOOT_MOUNTPOINT=/boot/firmware
+		;;
 	*)
 		;;
 esac
@@ -72,6 +80,14 @@ cp -a chroot/* mountpoint/
 
 setup_mountpoint mountpoint
 
+case $ARCH:$SUBARCH in
+	armhf:raspi2)
+		chroot mountpoint flash-kernel \
+			--machine "Raspberry Pi 2 Model B"
+		;;
+	*)	;;
+esac
+
 case $ARCH in
     amd64|i386) should_install_grub=1;;
              *) should_install_grub=0;;

live-build/ubuntu-cpc/hooks/040-qcow2-image.binary

@@ -1,5 +1,15 @@
 #!/bin/bash -ex
 
+case $ARCH:$SUBARCH in
+	# Not sure if any other cloud images use subarch for something that
+	# should take qcow2 format, so only skipping this on raspi2 for now.
+	armhf:raspi2)
+		apt-get install -qqy pxz
+		pxz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
+	        exit 0
+		;;
+esac
+
 apt-get install -qqy qemu-utils
 
 . /build/config/functions