From 426cc7e1e54f841b4c4c59d3d2573eea982749e2 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 11 Jun 2015 17:53:01 +0200 Subject: [PATCH] Import patches-unapplied version 2.315 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: c9f12e25b1354dd4c64a5b706d401b3c6794f54c New changelog entries: * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary, live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary,: - deal with vmlinuz .signed when copying kernels --- debian/changelog | 8 ++++++++ .../hooks/500-move-kernel-to-device-tar.binary | 6 +++++- .../hooks/500-move-kernel-to-device-tar.binary | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7048cf8..16cbe6ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.315) wily; urgency=medium + + * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary, + live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary,: + - deal with vmlinuz .signed when copying kernels + + -- Sebastien Bacher Thu, 11 Jun 2015 17:53:01 +0200 + livecd-rootfs (2.314) wily; urgency=medium [ Iain Lane ] 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 f6b77acf..ab19b2e5 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 @@ -27,7 +27,11 @@ mkdir -p $TMPDIR/assets/ # new assets handling # FIXME: # - how to keep version information (and do we care) - cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz + if [ -f boot/vmlinu?-*.signed ]; then + cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz + else + cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz + fi cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/ diff --git a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary index f6b77acf..ab19b2e5 100644 --- a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary +++ b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary @@ -27,7 +27,11 @@ mkdir -p $TMPDIR/assets/ # new assets handling # FIXME: # - how to keep version information (and do we care) - cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz + if [ -f boot/vmlinu?-*.signed ]; then + cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz + else + cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz + fi cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/