From 3ae0f6025fcc17a9625944d782d97cad537bfdce Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 17 Nov 2014 11:27:31 +0100
Subject: [PATCH] Import patches-unapplied version 2.268 to
 ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 92b0d8c50265bb9a3ef16d51a84bf81f7beca842

New changelog entries:
  * live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary:
    - build device tarball with system/ prefix
    - include /vmlinz, /initrd.img into device tarball
    - include /boot/abi-* /boot/System.map-*
---
 debian/changelog                              |  9 +++++
 .../hooks/09-move-kernel-to-device-tar.binary | 36 +++++++++++++------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88257a12..e9201fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.268) vivid; urgency=low
+
+  * live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary:
+    - build device tarball with system/ prefix
+    - include /vmlinz, /initrd.img into device tarball
+    - include /boot/abi-* /boot/System.map-*
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 17 Nov 2014 11:27:31 +0100
+
 livecd-rootfs (2.267) vivid; urgency=low
 
   * live-build/auto/config:
diff --git a/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary
index 5b68561d..769abcee 100644
--- a/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary
@@ -1,21 +1,37 @@
 #!/bin/sh
+#
+# move the kernel out into a new device tarfile with system/boot 
 
 set -e
 
-echo "Moving kernel into device tarball"
+echo "I: Moving kernel into device tarball"
 
-# remove the kernel, its part of the bootimg
-HERE=$(pwd)
-(cd binary/boot/filesystem.dir && \
-    tar czf $HERE/device.tar.gz \
-    boot/vmlinu?-* \
-    boot/initrd.img-* \
-    vmlinu? \
-    initrd.img \
-    lib/modules/ )
+HERE="$(pwd)"
+TMPDIR="$(mktemp -d)"
+mkdir -p $TMPDIR/system/
 
+# cp files, we can't simply use tar --transform as it changes the symlink target
+(
+ cd binary/boot/filesystem.dir 
+ cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
+ cp -ar --parent lib/modules/ $TMPDIR/system/
+ if [ -e vmlinu? ] && [ -e initrd.img ]; then
+     cp -ar --parent vmlinu? initrd.img $TMPDIR/system
+ fi
+)
+
+# and tar it up
+(
+ cd $TMPDIR
+ tar -c -z -f $HERE/device.tar.gz system
+)
+rm -rf $TMPDIR
+
+# remove files from the root filesystem
 rm -f binary/boot/filesystem.dir/boot/vmlinu?-*
 rm -f binary/boot/filesystem.dir/boot/initrd.img-*
+rm -f binary/boot/filesystem.dir/boot/abi-*
+rm -f binary/boot/filesystem.dir/boot/System.map-*
 rm -f binary/boot/filesystem.dir/initrd.img
 rm -f binary/boot/filesystem.dir/vmlinu?
 rm -rf binary/boot/filesystem.dir/lib/modules