Ubuntu Pastebin

Paste from debug at Thu, 11 Jun 2015 15:43:11 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-10 13:10:16 +0000
+++ debian/changelog	2015-06-11 15:42:51 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.315) UNRELEASED; 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 <seb128@ubuntu.com>  Thu, 11 Jun 2015 17:41:06 +0200
+
 livecd-rootfs (2.314) wily; urgency=medium
 
   [ Iain Lane ]

=== modified file 'live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary'
--- live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary	2015-06-09 09:19:31 +0000
+++ live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary	2015-06-11 15:41:33 +0000
@@ -27,7 +27,11 @@
  # 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/
 

=== modified file 'live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary'
--- live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary	2015-06-10 09:25:53 +0000
+++ live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary	2015-06-11 15:40:57 +0000
@@ -27,7 +27,11 @@
  # 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/
Download as text