From 9eaa1cb0b2fa982277c9eac3b6ecd3f6bf75aeac Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 8 Jul 2015 17:46:36 +0200
Subject: [PATCH] Import patches-unapplied version 2.327 to
 ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: d61ed6ef41f71a97dfe529c8ee7812f6d4ad1257

New changelog entries:
  * merge lp:~sergiusens/livecd-rootfs/snappyDevicePart for using versioned
    kernel and initrd binaries in snappy
---
 debian/changelog                              |  7 ++++
 .../500-move-kernel-to-device-tar.binary      | 33 ++++++++-----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5549b62..6ae08639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.327) wily; urgency=medium
+
+  * merge lp:~sergiusens/livecd-rootfs/snappyDevicePart for using versioned
+    kernel and initrd binaries in snappy
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 08 Jul 2015 17:46:36 +0200
+
 livecd-rootfs (2.326) wily; urgency=medium
 
   * snappy: install libc6:i386 on amd64 images for multiarch support out of
diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
index 3d02b99b..e0f40efc 100644
--- a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
@@ -14,41 +14,36 @@ mkdir -p $TMPDIR/assets/
 
 # cp files, we can't simply use tar --transform as it changes the symlink target
 (
- cd binary/boot/filesystem.dir 
+ cd binary/boot/filesystem.dir
 
- # for compatibility with current grub/u-d-f
- cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
- if [ -e vmlinu? ] && [ -e initrd.img ]; then
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/system
- fi
  cp -ar --parent lib/modules/ $TMPDIR/system/
  cp -ar --parent lib/firmware/ $TMPDIR/system/
 
  # new assets handling
- # FIXME:
- # - how to keep version information (and do we care)
  if [ -f boot/vmlinu?-*.signed ]; then
-    cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz
+    kernel=boot/vmlinu?-*.signed
  else
-    cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
+    kernel=boot/vmlinu?-*
  fi
- cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
+
+ initrd=boot/initrd.img-*
+
+ cp -ar "$initrd" $TMPDIR/assets/
+ cp -ar "$kernel" $TMPDIR/assets/
  cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/
 
  dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
  if [ -n "$dtbs" ]; then
     mv "$dtbs" $TMPDIR/assets/dtbs
  fi
-)
 
-# create hardware.yaml for u-boot
-# this assumes armh == u-boot
-# and all others grub
-(
-# common bits
+ # create hardware.yaml
+ # this assumes armh == u-boot
+ # and all others grub
+ # common bits
  cat > $TMPDIR/hardware.yaml << EOF
-kernel: assets/vmlinuz
-initrd: assets/initrd.img
+kernel: assets/$(basename "$kernel")
+initrd: assets/$(basename "$initrd")
 partition-layout: system-AB
 EOF