diff -Nru livecd-rootfs-2.301~ppa13/debian/changelog livecd-rootfs-2.301~ppa14/debian/changelog
--- livecd-rootfs-2.301~ppa13/debian/changelog 2015-07-08 12:40:53.000000000 -0300
+++ livecd-rootfs-2.301~ppa14/debian/changelog 2015-07-08 14:45:23.000000000 -0300
@@ -1,3 +1,10 @@
+livecd-rootfs (2.301~ppa14) vivid; urgency=medium
+
+ * Typo s/vmlinux/vmlinuz/ and only use the hashes entry in hardware.yaml for
+ armhf.
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 08 Jul 2015 14:25:46 -0300
+
livecd-rootfs (2.301~ppa13) vivid; urgency=medium
* Hash the kernel/initrd to provide updates of hardware.yaml when
diff -Nru livecd-rootfs-2.301~ppa13/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary livecd-rootfs-2.301~ppa14/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
--- livecd-rootfs-2.301~ppa13/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary 2015-07-08 12:37:43.000000000 -0300
+++ livecd-rootfs-2.301~ppa14/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary 2015-07-08 14:47:05.000000000 -0300
@@ -40,12 +40,8 @@
# this assumes armh == u-boot
# and all others grub
(
-vmlinuz_hash=$(md5sum $TMPDIR/assets/vmlinuz| cut -f1 -d\ )
-initrd_hash=$(md5sum $TMPDIR/assets/initrd.img| cut -f1 -d\ )
-
# common bits
cat > $TMPDIR/hardware.yaml << EOF
-hashes: $vmlinux_hash-$initrd_hash
kernel: assets/vmlinuz
initrd: assets/initrd.img
partition-layout: system-AB
@@ -53,7 +49,11 @@
# arch specific ones
if [ "$ARCH" = "armhf" ]; then
+ vmlinuz_hash="$(md5sum $TMPDIR/assets/vmlinuz| cut -f1 -d\ )"
+ initrd_hash="$(md5sum $TMPDIR/assets/initrd.img| cut -f1 -d\ )"
+
cat >> $TMPDIR/hardware.yaml << EOF
+hashes: $vmlinuz_hash-$initrd_hash
dtbs: assets/dtbs
bootloader: u-boot
EOF