livecd-rootfs

Merge lp:~rcj/livecd-rootfs/yakkety_arm64 into lp:livecd-rootfs

  1. yakkety_arm64
  2. Merge into trunk
Proposed by Dan Watkins on 2016-09-23
Status: Merged
Merged at revision: 1445
Proposed branch: lp:~rcj/livecd-rootfs/yakkety_arm64
Merge into: lp:livecd-rootfs
Diff against target: 42 lines (+12/-1)
3 files modified
debian/changelog (+10/-0)
live-build/auto/config (+1/-0)
live-build/ubuntu-cpc/hooks/032-root-squashfs.binary (+1/-1)
To merge this branch: bzr merge lp:~rcj/livecd-rootfs/yakkety_arm64
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2016-09-23 Pending
Review via email: mp+306599@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-09-23 03:55:08 +0000
3+++ debian/changelog 2016-09-23 09:37:09 +0000
4@@ -1,3 +1,13 @@
5+livecd-rootfs (2.434) yakkety; urgency=medium
6+
7+ * Use the arm64 generic kernel for cpc images (Revert 2.433)
8+ - A virtual kernel does not exist for arm64
9+ * Skip flash-kernel when removing kernels in cpc squashfs image
10+ - Avoid a failure (LP: #1626848) when calling flash-kernel twice
11+ when removing a kernel.
12+
13+ -- Robert C Jennings <robert.jennings@canonical.com> Fri, 23 Sep 2016 01:43:46 -0500
14+
15 livecd-rootfs (2.433) yakkety; urgency=medium
16
17 * Use the virtual kernel for the arm64 cpc images instead of generic.
18
19=== modified file 'live-build/auto/config'
20--- live-build/auto/config 2016-09-23 03:55:08 +0000
21+++ live-build/auto/config 2016-09-23 09:37:09 +0000
22@@ -469,6 +469,7 @@
23 add_task install server
24 ;;
25 arm64)
26+ KERNEL_FLAVOURS=generic
27 add_package install flash-kernel
28 add_task install server
29 ;;
30
31=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
32--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary 2016-06-09 09:47:25 +0000
33+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary 2016-09-23 09:37:09 +0000
34@@ -19,7 +19,7 @@
35 chroot binary/boot/squashfs.dir touch /usr/sbin/grub-probe
36 chroot binary/boot/squashfs.dir chmod +x /usr/sbin/grub-probe
37
38-env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
39+env DEBIAN_FRONTEND=noninteractive FLASH_KERNEL_SKIP=1 chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
40 env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^grub-.*'
41 env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes
42 chroot binary/boot/squashfs.dir mkdir /lib/modules

Subscribers

People subscribed via source and target branches