debian-installer

Merge lp:~sil2100/debian-installer/kernel-bump into lp:~ubuntu-core-dev/debian-installer/xenial-proposed

  1. kernel-bump
  2. Merge into xenial-proposed
Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 2181
Proposed branch: lp:~sil2100/debian-installer/kernel-bump
Merge into: lp:~ubuntu-core-dev/debian-installer/xenial-proposed
Diff against target: 346 lines (+42/-29)
29 files modified
build/config/amd64.cfg (+1/-1)
build/config/amd64/hwe-cdrom-xen.cfg (+1/-1)
build/config/amd64/hwe-cdrom.cfg (+1/-1)
build/config/amd64/hwe-hd-media.cfg (+1/-1)
build/config/amd64/hwe-netboot-gtk.cfg (+1/-1)
build/config/amd64/hwe-netboot-xen.cfg (+1/-1)
build/config/amd64/hwe-netboot.cfg (+1/-1)
build/config/arm64.cfg (+1/-1)
build/config/arm64/hwe-cdrom.cfg (+1/-1)
build/config/arm64/hwe-device-tree.cfg (+1/-1)
build/config/arm64/hwe-netboot.cfg (+1/-1)
build/config/armel.cfg (+1/-1)
build/config/armel/hwe-generic-lpae.cfg (+1/-1)
build/config/armel/hwe-generic.cfg (+1/-1)
build/config/armhf.cfg (+1/-1)
build/config/i386.cfg (+1/-1)
build/config/i386/hwe-cdrom-xen.cfg (+1/-1)
build/config/i386/hwe-cdrom.cfg (+1/-1)
build/config/i386/hwe-hd-media.cfg (+1/-1)
build/config/i386/hwe-netboot-gtk.cfg (+1/-1)
build/config/i386/hwe-netboot-xen.cfg (+1/-1)
build/config/i386/hwe-netboot.cfg (+1/-1)
build/config/powerpc.cfg (+1/-1)
build/config/ppc64el.cfg (+1/-1)
build/config/ppc64el/hwe-cdrom.cfg (+1/-1)
build/config/ppc64el/hwe-netboot.cfg (+1/-1)
build/config/s390x.cfg (+1/-1)
build/config/s390x/hwe-generic.cfg (+1/-1)
debian/changelog (+14/-1)
To merge this branch: bzr merge lp:~sil2100/debian-installer/kernel-bump
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+337807@code.launchpad.net

Commit message

* Move master kernels to 4.4.0-116.
* Move hwe kernels to 4.13.0-36.

Description of the change

Bump the kernels.

To post a comment you must log in.
lp:~sil2100/debian-installer/kernel-bump updated
2183. By Łukasz Zemczak

Add changelog entry.

2184. By Łukasz Zemczak

Bump the hwe kernels again.

2185. By Łukasz Zemczak

Fix changelog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/config/amd64.cfg'
--- build/config/amd64.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64.cfg 2018-02-20 08:33:10 +0000
@@ -2,7 +2,7 @@
2MEDIUM_SUPPORTED_EXTRA = monolithic2MEDIUM_SUPPORTED_EXTRA = monolithic
33
4# The version of the kernel to use.4# The version of the kernel to use.
5BASEVERSION = 4.4.0-1015BASEVERSION = 4.4.0-116
6KERNELVERSION = $(BASEVERSION)-generic6KERNELVERSION = $(BASEVERSION)-generic
7KERNELMAJOR = 2.67KERNELMAJOR = 2.6
8KERNEL_FLAVOUR = di8KERNEL_FLAVOUR = di
99
=== modified file 'build/config/amd64/hwe-cdrom-xen.cfg'
--- build/config/amd64/hwe-cdrom-xen.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64/hwe-cdrom-xen.cfg 2018-02-20 08:33:10 +0000
@@ -3,5 +3,5 @@
33
4include config/amd64/cdrom-xen.cfg4include config/amd64/cdrom-xen.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
7EXTRANAME = hwe-cdrom/xen/7EXTRANAME = hwe-cdrom/xen/
88
=== modified file 'build/config/amd64/hwe-cdrom.cfg'
--- build/config/amd64/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/amd64/cdrom.cfg4include config/amd64/cdrom.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'build/config/amd64/hwe-hd-media.cfg'
--- build/config/amd64/hwe-hd-media.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64/hwe-hd-media.cfg 2018-02-20 08:33:10 +0000
@@ -3,5 +3,5 @@
33
4include config/amd64/hd-media.cfg4include config/amd64/hd-media.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
7EXTRANAME = hwe-hd-media/7EXTRANAME = hwe-hd-media/
88
=== modified file 'build/config/amd64/hwe-netboot-gtk.cfg'
--- build/config/amd64/hwe-netboot-gtk.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64/hwe-netboot-gtk.cfg 2018-02-20 08:33:10 +0000
@@ -3,5 +3,5 @@
33
4include config/amd64/netboot-gtk.cfg4include config/amd64/netboot-gtk.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
7EXTRANAME = hwe-netboot/gtk/7EXTRANAME = hwe-netboot/gtk/
88
=== modified file 'build/config/amd64/hwe-netboot-xen.cfg'
--- build/config/amd64/hwe-netboot-xen.cfg 2017-11-18 19:18:44 +0000
+++ build/config/amd64/hwe-netboot-xen.cfg 2018-02-20 08:33:10 +0000
@@ -3,5 +3,5 @@
33
4include config/amd64/netboot-xen.cfg4include config/amd64/netboot-xen.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
7EXTRANAME = hwe-netboot/xen/7EXTRANAME = hwe-netboot/xen/
88
=== modified file 'build/config/amd64/hwe-netboot.cfg'
--- build/config/amd64/hwe-netboot.cfg 2017-11-18 19:55:25 +0000
+++ build/config/amd64/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
@@ -3,5 +3,5 @@
33
4include config/amd64/netboot.cfg4include config/amd64/netboot.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
7FLOPPY_SIZE = 522247FLOPPY_SIZE = 52224
88
=== modified file 'build/config/arm64.cfg'
--- build/config/arm64.cfg 2017-11-30 20:46:47 +0000
+++ build/config/arm64.cfg 2018-02-20 08:33:10 +0000
@@ -1,7 +1,7 @@
1MEDIUM_SUPPORTED = cdrom netboot device-tree hwe-cdrom hwe-netboot hwe-device-tree1MEDIUM_SUPPORTED = cdrom netboot device-tree hwe-cdrom hwe-netboot hwe-device-tree
22
3KERNELMAJOR = 2.63KERNELMAJOR = 2.6
4KERNELVERSION = 4.4.0-101-generic4KERNELVERSION = 4.4.0-116-generic
5KERNEL_FLAVOUR = di5KERNEL_FLAVOUR = di
6KERNELIMAGEVERSION = $(KERNELVERSION)6KERNELIMAGEVERSION = $(KERNELVERSION)
7KERNELNAME = vmlinuz7KERNELNAME = vmlinuz
88
=== modified file 'build/config/arm64/hwe-cdrom.cfg'
--- build/config/arm64/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
+++ build/config/arm64/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/arm64/cdrom.cfg4include config/arm64/cdrom.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'build/config/arm64/hwe-device-tree.cfg'
--- build/config/arm64/hwe-device-tree.cfg 2017-11-18 19:18:44 +0000
+++ build/config/arm64/hwe-device-tree.cfg 2018-02-20 08:33:10 +0000
@@ -1,6 +1,6 @@
1TYPE = device-tree1TYPE = device-tree
2include config/arm64/device-tree.cfg2include config/arm64/device-tree.cfg
33
4KERNELVERSION = 4.10.0-40-generic4KERNELVERSION = 4.13.0-36-generic
55
6EXTRANAME = hwe-device-tree/6EXTRANAME = hwe-device-tree/
77
=== modified file 'build/config/arm64/hwe-netboot.cfg'
--- build/config/arm64/hwe-netboot.cfg 2017-11-18 19:18:44 +0000
+++ build/config/arm64/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/arm64/netboot.cfg4include config/arm64/netboot.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'build/config/armel.cfg'
--- build/config/armel.cfg 2017-11-18 19:18:44 +0000
+++ build/config/armel.cfg 2018-02-20 08:33:10 +0000
@@ -2,7 +2,7 @@
2#SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads dove omap42#SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads dove omap4
33
4KERNELMAJOR = 2.64KERNELMAJOR = 2.6
5KERNELVERSION = 4.4.0-1015KERNELVERSION = 4.4.0-116
6KERNEL_FLAVOUR = di6KERNEL_FLAVOUR = di
7KERNELIMAGEVERSION = $(KERNELVERSION)7KERNELIMAGEVERSION = $(KERNELVERSION)
8KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))8KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
99
=== modified file 'build/config/armel/hwe-generic-lpae.cfg'
--- build/config/armel/hwe-generic-lpae.cfg 2017-11-18 19:18:44 +0000
+++ build/config/armel/hwe-generic-lpae.cfg 2018-02-20 08:33:10 +0000
@@ -2,4 +2,4 @@
22
3include config/armel/generic-lpae.cfg3include config/armel/generic-lpae.cfg
44
5KERNELVERSION = 4.10.0-40-generic-lpae5KERNELVERSION = 4.13.0-36-generic-lpae
66
=== modified file 'build/config/armel/hwe-generic.cfg'
--- build/config/armel/hwe-generic.cfg 2017-11-18 19:18:44 +0000
+++ build/config/armel/hwe-generic.cfg 2018-02-20 08:33:10 +0000
@@ -2,4 +2,4 @@
22
3include config/armel/generic.cfg3include config/armel/generic.cfg
44
5KERNELVERSION = 4.10.0-40-generic5KERNELVERSION = 4.13.0-36-generic
66
=== modified file 'build/config/armhf.cfg'
--- build/config/armhf.cfg 2017-11-18 19:18:44 +0000
+++ build/config/armhf.cfg 2018-02-20 08:33:10 +0000
@@ -3,7 +3,7 @@
3MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.33MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
44
5KERNELMAJOR = 2.65KERNELMAJOR = 2.6
6KERNELVERSION = 4.4.0-1016KERNELVERSION = 4.4.0-116
7KERNEL_FLAVOUR = di7KERNEL_FLAVOUR = di
8KERNELIMAGEVERSION = $(KERNELVERSION)8KERNELIMAGEVERSION = $(KERNELVERSION)
9KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))9KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
1010
=== modified file 'build/config/i386.cfg'
--- build/config/i386.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386.cfg 2018-02-20 08:33:10 +0000
@@ -2,7 +2,7 @@
2MEDIUM_SUPPORTED_EXTRA = monolithic2MEDIUM_SUPPORTED_EXTRA = monolithic
33
4# The version of the kernel to use.4# The version of the kernel to use.
5BASEVERSION = 4.4.0-1015BASEVERSION = 4.4.0-116
6KERNELVERSION = $(BASEVERSION)-generic6KERNELVERSION = $(BASEVERSION)-generic
7KERNELMAJOR = 2.67KERNELMAJOR = 2.6
8KERNEL_FLAVOUR = di8KERNEL_FLAVOUR = di
99
=== modified file 'build/config/i386/hwe-cdrom-xen.cfg'
--- build/config/i386/hwe-cdrom-xen.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386/hwe-cdrom-xen.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = cdrom/gtk1TYPE = cdrom/gtk
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/cdrom-xen.cfg5include config/i386/cdrom-xen.cfg
66
=== modified file 'build/config/i386/hwe-cdrom.cfg'
--- build/config/i386/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = cdrom1TYPE = cdrom
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/cdrom.cfg5include config/i386/cdrom.cfg
66
=== modified file 'build/config/i386/hwe-hd-media.cfg'
--- build/config/i386/hwe-hd-media.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386/hwe-hd-media.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = hd-media1TYPE = hd-media
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/hd-media.cfg5include config/i386/hd-media.cfg
66
=== modified file 'build/config/i386/hwe-netboot-gtk.cfg'
--- build/config/i386/hwe-netboot-gtk.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386/hwe-netboot-gtk.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = netboot/gtk1TYPE = netboot/gtk
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/netboot-gtk.cfg5include config/i386/netboot-gtk.cfg
66
=== modified file 'build/config/i386/hwe-netboot-xen.cfg'
--- build/config/i386/hwe-netboot-xen.cfg 2017-11-18 19:18:44 +0000
+++ build/config/i386/hwe-netboot-xen.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = netboot/gtk1TYPE = netboot/gtk
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/netboot-xen.cfg5include config/i386/netboot-xen.cfg
66
=== modified file 'build/config/i386/hwe-netboot.cfg'
--- build/config/i386/hwe-netboot.cfg 2017-11-18 19:55:25 +0000
+++ build/config/i386/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
@@ -1,5 +1,5 @@
1TYPE = netboot1TYPE = netboot
2BASEVERSION = 4.10.0-402BASEVERSION = 4.13.0-36
3PRESEED = boot/lts-preseeds/hwe.preseed3PRESEED = boot/lts-preseeds/hwe.preseed
44
5include config/i386/netboot.cfg5include config/i386/netboot.cfg
66
=== modified file 'build/config/powerpc.cfg'
--- build/config/powerpc.cfg 2017-11-18 19:18:44 +0000
+++ build/config/powerpc.cfg 2018-02-20 08:33:10 +0000
@@ -1,7 +1,7 @@
1SUBARCH_SUPPORTED = powerpc powerpc64 e500mc # apus prep1SUBARCH_SUPPORTED = powerpc powerpc64 e500mc # apus prep
22
3KERNELMAJOR = 2.63KERNELMAJOR = 2.6
4BASEVERSION = 4.4.0-1014BASEVERSION = 4.4.0-116
55
6# create the kernels with builtin initrd.6# create the kernels with builtin initrd.
7builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)7builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
88
=== modified file 'build/config/ppc64el.cfg'
--- build/config/ppc64el.cfg 2017-11-18 19:18:44 +0000
+++ build/config/ppc64el.cfg 2018-02-20 08:33:10 +0000
@@ -1,7 +1,7 @@
1MEDIUM_SUPPORTED = netboot cdrom hwe-netboot hwe-cdrom1MEDIUM_SUPPORTED = netboot cdrom hwe-netboot hwe-cdrom
22
3KERNELMAJOR = 2.63KERNELMAJOR = 2.6
4BASEVERSION = 4.4.0-1014BASEVERSION = 4.4.0-116
5KERNELVERSION = $(BASEVERSION)-generic5KERNELVERSION = $(BASEVERSION)-generic
6KERNEL_FLAVOUR = di6KERNEL_FLAVOUR = di
7KERNELNAME = vmlinux7KERNELNAME = vmlinux
88
=== modified file 'build/config/ppc64el/hwe-cdrom.cfg'
--- build/config/ppc64el/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
+++ build/config/ppc64el/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/ppc64el/cdrom.cfg4include config/ppc64el/cdrom.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'build/config/ppc64el/hwe-netboot.cfg'
--- build/config/ppc64el/hwe-netboot.cfg 2017-11-18 19:18:44 +0000
+++ build/config/ppc64el/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/ppc64el/netboot.cfg4include config/ppc64el/netboot.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'build/config/s390x.cfg'
--- build/config/s390x.cfg 2017-11-18 19:18:44 +0000
+++ build/config/s390x.cfg 2018-02-20 08:33:10 +0000
@@ -3,7 +3,7 @@
3KERNEL = $(DEST)/image.ubuntu3KERNEL = $(DEST)/image.ubuntu
44
5KERNELMAJOR = 2.65KERNELMAJOR = 2.6
6BASEVERSION = 4.4.0-1016BASEVERSION = 4.4.0-116
7KERNELVERSION = $(BASEVERSION)-generic7KERNELVERSION = $(BASEVERSION)-generic
8KERNEL_FLAVOUR = di8KERNEL_FLAVOUR = di
9KERNELNAME = vmlinuz9KERNELNAME = vmlinuz
1010
=== modified file 'build/config/s390x/hwe-generic.cfg'
--- build/config/s390x/hwe-generic.cfg 2017-11-18 19:18:44 +0000
+++ build/config/s390x/hwe-generic.cfg 2018-02-20 08:33:10 +0000
@@ -3,4 +3,4 @@
33
4include config/s390x/generic.cfg4include config/s390x/generic.cfg
55
6KERNELVERSION = 4.10.0-40-generic6KERNELVERSION = 4.13.0-36-generic
77
=== modified file 'debian/changelog'
--- debian/changelog 2018-02-09 11:56:56 +0000
+++ debian/changelog 2018-02-20 08:33:10 +0000
@@ -1,4 +1,4 @@
1debian-installer (20101020ubuntu451.20) UNRELEASED; urgency=medium1debian-installer (20101020ubuntu451.22) UNRELEASED; urgency=medium
22
3 * arm64-efi/netboot: Improvements to mini.iso generation:3 * arm64-efi/netboot: Improvements to mini.iso generation:
4 - Add an EFI System Partition to fix booting from USB stick on4 - Add an EFI System Partition to fix booting from USB stick on
@@ -12,6 +12,19 @@
1212
13 -- dann frazier <dannf@ubuntu.com> Thu, 30 Nov 2017 12:50:14 -070013 -- dann frazier <dannf@ubuntu.com> Thu, 30 Nov 2017 12:50:14 -0700
1414
15debian-installer (20101020ubuntu451.21) xenial; urgency=medium
16
17 * Move hwe kernels to 4.13.0-36.
18
19 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 20 Feb 2018 09:30:34 +0100
20
21debian-installer (20101020ubuntu451.20) xenial; urgency=medium
22
23 * Move master kernels to 4.4.0-116.
24 * Move hwe kernels to 4.13.0-35.
25
26 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 15 Feb 2018 18:02:24 +0100
27
15debian-installer (20101020ubuntu451.19) xenial; urgency=medium28debian-installer (20101020ubuntu451.19) xenial; urgency=medium
1629
17 * No change rebuild to pick up the latest change in preseed (LP: #1745531) 30 * No change rebuild to pick up the latest change in preseed (LP: #1745531)

Subscribers

People subscribed via source and target branches