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
1=== modified file 'build/config/amd64.cfg'
2--- build/config/amd64.cfg 2017-11-18 19:18:44 +0000
3+++ build/config/amd64.cfg 2018-02-20 08:33:10 +0000
4@@ -2,7 +2,7 @@
5 MEDIUM_SUPPORTED_EXTRA = monolithic
6
7 # The version of the kernel to use.
8-BASEVERSION = 4.4.0-101
9+BASEVERSION = 4.4.0-116
10 KERNELVERSION = $(BASEVERSION)-generic
11 KERNELMAJOR = 2.6
12 KERNEL_FLAVOUR = di
13
14=== modified file 'build/config/amd64/hwe-cdrom-xen.cfg'
15--- build/config/amd64/hwe-cdrom-xen.cfg 2017-11-18 19:18:44 +0000
16+++ build/config/amd64/hwe-cdrom-xen.cfg 2018-02-20 08:33:10 +0000
17@@ -3,5 +3,5 @@
18
19 include config/amd64/cdrom-xen.cfg
20
21-KERNELVERSION = 4.10.0-40-generic
22+KERNELVERSION = 4.13.0-36-generic
23 EXTRANAME = hwe-cdrom/xen/
24
25=== modified file 'build/config/amd64/hwe-cdrom.cfg'
26--- build/config/amd64/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
27+++ build/config/amd64/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
28@@ -3,4 +3,4 @@
29
30 include config/amd64/cdrom.cfg
31
32-KERNELVERSION = 4.10.0-40-generic
33+KERNELVERSION = 4.13.0-36-generic
34
35=== modified file 'build/config/amd64/hwe-hd-media.cfg'
36--- build/config/amd64/hwe-hd-media.cfg 2017-11-18 19:18:44 +0000
37+++ build/config/amd64/hwe-hd-media.cfg 2018-02-20 08:33:10 +0000
38@@ -3,5 +3,5 @@
39
40 include config/amd64/hd-media.cfg
41
42-KERNELVERSION = 4.10.0-40-generic
43+KERNELVERSION = 4.13.0-36-generic
44 EXTRANAME = hwe-hd-media/
45
46=== modified file 'build/config/amd64/hwe-netboot-gtk.cfg'
47--- build/config/amd64/hwe-netboot-gtk.cfg 2017-11-18 19:18:44 +0000
48+++ build/config/amd64/hwe-netboot-gtk.cfg 2018-02-20 08:33:10 +0000
49@@ -3,5 +3,5 @@
50
51 include config/amd64/netboot-gtk.cfg
52
53-KERNELVERSION = 4.10.0-40-generic
54+KERNELVERSION = 4.13.0-36-generic
55 EXTRANAME = hwe-netboot/gtk/
56
57=== modified file 'build/config/amd64/hwe-netboot-xen.cfg'
58--- build/config/amd64/hwe-netboot-xen.cfg 2017-11-18 19:18:44 +0000
59+++ build/config/amd64/hwe-netboot-xen.cfg 2018-02-20 08:33:10 +0000
60@@ -3,5 +3,5 @@
61
62 include config/amd64/netboot-xen.cfg
63
64-KERNELVERSION = 4.10.0-40-generic
65+KERNELVERSION = 4.13.0-36-generic
66 EXTRANAME = hwe-netboot/xen/
67
68=== modified file 'build/config/amd64/hwe-netboot.cfg'
69--- build/config/amd64/hwe-netboot.cfg 2017-11-18 19:55:25 +0000
70+++ build/config/amd64/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
71@@ -3,5 +3,5 @@
72
73 include config/amd64/netboot.cfg
74
75-KERNELVERSION = 4.10.0-40-generic
76+KERNELVERSION = 4.13.0-36-generic
77 FLOPPY_SIZE = 52224
78
79=== modified file 'build/config/arm64.cfg'
80--- build/config/arm64.cfg 2017-11-30 20:46:47 +0000
81+++ build/config/arm64.cfg 2018-02-20 08:33:10 +0000
82@@ -1,7 +1,7 @@
83 MEDIUM_SUPPORTED = cdrom netboot device-tree hwe-cdrom hwe-netboot hwe-device-tree
84
85 KERNELMAJOR = 2.6
86-KERNELVERSION = 4.4.0-101-generic
87+KERNELVERSION = 4.4.0-116-generic
88 KERNEL_FLAVOUR = di
89 KERNELIMAGEVERSION = $(KERNELVERSION)
90 KERNELNAME = vmlinuz
91
92=== modified file 'build/config/arm64/hwe-cdrom.cfg'
93--- build/config/arm64/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
94+++ build/config/arm64/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
95@@ -3,4 +3,4 @@
96
97 include config/arm64/cdrom.cfg
98
99-KERNELVERSION = 4.10.0-40-generic
100+KERNELVERSION = 4.13.0-36-generic
101
102=== modified file 'build/config/arm64/hwe-device-tree.cfg'
103--- build/config/arm64/hwe-device-tree.cfg 2017-11-18 19:18:44 +0000
104+++ build/config/arm64/hwe-device-tree.cfg 2018-02-20 08:33:10 +0000
105@@ -1,6 +1,6 @@
106 TYPE = device-tree
107 include config/arm64/device-tree.cfg
108
109-KERNELVERSION = 4.10.0-40-generic
110+KERNELVERSION = 4.13.0-36-generic
111
112 EXTRANAME = hwe-device-tree/
113
114=== modified file 'build/config/arm64/hwe-netboot.cfg'
115--- build/config/arm64/hwe-netboot.cfg 2017-11-18 19:18:44 +0000
116+++ build/config/arm64/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
117@@ -3,4 +3,4 @@
118
119 include config/arm64/netboot.cfg
120
121-KERNELVERSION = 4.10.0-40-generic
122+KERNELVERSION = 4.13.0-36-generic
123
124=== modified file 'build/config/armel.cfg'
125--- build/config/armel.cfg 2017-11-18 19:18:44 +0000
126+++ build/config/armel.cfg 2018-02-20 08:33:10 +0000
127@@ -2,7 +2,7 @@
128 #SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads dove omap4
129
130 KERNELMAJOR = 2.6
131-KERNELVERSION = 4.4.0-101
132+KERNELVERSION = 4.4.0-116
133 KERNEL_FLAVOUR = di
134 KERNELIMAGEVERSION = $(KERNELVERSION)
135 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
136
137=== modified file 'build/config/armel/hwe-generic-lpae.cfg'
138--- build/config/armel/hwe-generic-lpae.cfg 2017-11-18 19:18:44 +0000
139+++ build/config/armel/hwe-generic-lpae.cfg 2018-02-20 08:33:10 +0000
140@@ -2,4 +2,4 @@
141
142 include config/armel/generic-lpae.cfg
143
144-KERNELVERSION = 4.10.0-40-generic-lpae
145+KERNELVERSION = 4.13.0-36-generic-lpae
146
147=== modified file 'build/config/armel/hwe-generic.cfg'
148--- build/config/armel/hwe-generic.cfg 2017-11-18 19:18:44 +0000
149+++ build/config/armel/hwe-generic.cfg 2018-02-20 08:33:10 +0000
150@@ -2,4 +2,4 @@
151
152 include config/armel/generic.cfg
153
154-KERNELVERSION = 4.10.0-40-generic
155+KERNELVERSION = 4.13.0-36-generic
156
157=== modified file 'build/config/armhf.cfg'
158--- build/config/armhf.cfg 2017-11-18 19:18:44 +0000
159+++ build/config/armhf.cfg 2018-02-20 08:33:10 +0000
160@@ -3,7 +3,7 @@
161 MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
162
163 KERNELMAJOR = 2.6
164-KERNELVERSION = 4.4.0-101
165+KERNELVERSION = 4.4.0-116
166 KERNEL_FLAVOUR = di
167 KERNELIMAGEVERSION = $(KERNELVERSION)
168 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
169
170=== modified file 'build/config/i386.cfg'
171--- build/config/i386.cfg 2017-11-18 19:18:44 +0000
172+++ build/config/i386.cfg 2018-02-20 08:33:10 +0000
173@@ -2,7 +2,7 @@
174 MEDIUM_SUPPORTED_EXTRA = monolithic
175
176 # The version of the kernel to use.
177-BASEVERSION = 4.4.0-101
178+BASEVERSION = 4.4.0-116
179 KERNELVERSION = $(BASEVERSION)-generic
180 KERNELMAJOR = 2.6
181 KERNEL_FLAVOUR = di
182
183=== modified file 'build/config/i386/hwe-cdrom-xen.cfg'
184--- build/config/i386/hwe-cdrom-xen.cfg 2017-11-18 19:18:44 +0000
185+++ build/config/i386/hwe-cdrom-xen.cfg 2018-02-20 08:33:10 +0000
186@@ -1,5 +1,5 @@
187 TYPE = cdrom/gtk
188-BASEVERSION = 4.10.0-40
189+BASEVERSION = 4.13.0-36
190 PRESEED = boot/lts-preseeds/hwe.preseed
191
192 include config/i386/cdrom-xen.cfg
193
194=== modified file 'build/config/i386/hwe-cdrom.cfg'
195--- build/config/i386/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
196+++ build/config/i386/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
197@@ -1,5 +1,5 @@
198 TYPE = cdrom
199-BASEVERSION = 4.10.0-40
200+BASEVERSION = 4.13.0-36
201 PRESEED = boot/lts-preseeds/hwe.preseed
202
203 include config/i386/cdrom.cfg
204
205=== modified file 'build/config/i386/hwe-hd-media.cfg'
206--- build/config/i386/hwe-hd-media.cfg 2017-11-18 19:18:44 +0000
207+++ build/config/i386/hwe-hd-media.cfg 2018-02-20 08:33:10 +0000
208@@ -1,5 +1,5 @@
209 TYPE = hd-media
210-BASEVERSION = 4.10.0-40
211+BASEVERSION = 4.13.0-36
212 PRESEED = boot/lts-preseeds/hwe.preseed
213
214 include config/i386/hd-media.cfg
215
216=== modified file 'build/config/i386/hwe-netboot-gtk.cfg'
217--- build/config/i386/hwe-netboot-gtk.cfg 2017-11-18 19:18:44 +0000
218+++ build/config/i386/hwe-netboot-gtk.cfg 2018-02-20 08:33:10 +0000
219@@ -1,5 +1,5 @@
220 TYPE = netboot/gtk
221-BASEVERSION = 4.10.0-40
222+BASEVERSION = 4.13.0-36
223 PRESEED = boot/lts-preseeds/hwe.preseed
224
225 include config/i386/netboot-gtk.cfg
226
227=== modified file 'build/config/i386/hwe-netboot-xen.cfg'
228--- build/config/i386/hwe-netboot-xen.cfg 2017-11-18 19:18:44 +0000
229+++ build/config/i386/hwe-netboot-xen.cfg 2018-02-20 08:33:10 +0000
230@@ -1,5 +1,5 @@
231 TYPE = netboot/gtk
232-BASEVERSION = 4.10.0-40
233+BASEVERSION = 4.13.0-36
234 PRESEED = boot/lts-preseeds/hwe.preseed
235
236 include config/i386/netboot-xen.cfg
237
238=== modified file 'build/config/i386/hwe-netboot.cfg'
239--- build/config/i386/hwe-netboot.cfg 2017-11-18 19:55:25 +0000
240+++ build/config/i386/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
241@@ -1,5 +1,5 @@
242 TYPE = netboot
243-BASEVERSION = 4.10.0-40
244+BASEVERSION = 4.13.0-36
245 PRESEED = boot/lts-preseeds/hwe.preseed
246
247 include config/i386/netboot.cfg
248
249=== modified file 'build/config/powerpc.cfg'
250--- build/config/powerpc.cfg 2017-11-18 19:18:44 +0000
251+++ build/config/powerpc.cfg 2018-02-20 08:33:10 +0000
252@@ -1,7 +1,7 @@
253 SUBARCH_SUPPORTED = powerpc powerpc64 e500mc # apus prep
254
255 KERNELMAJOR = 2.6
256-BASEVERSION = 4.4.0-101
257+BASEVERSION = 4.4.0-116
258
259 # create the kernels with builtin initrd.
260 builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
261
262=== modified file 'build/config/ppc64el.cfg'
263--- build/config/ppc64el.cfg 2017-11-18 19:18:44 +0000
264+++ build/config/ppc64el.cfg 2018-02-20 08:33:10 +0000
265@@ -1,7 +1,7 @@
266 MEDIUM_SUPPORTED = netboot cdrom hwe-netboot hwe-cdrom
267
268 KERNELMAJOR = 2.6
269-BASEVERSION = 4.4.0-101
270+BASEVERSION = 4.4.0-116
271 KERNELVERSION = $(BASEVERSION)-generic
272 KERNEL_FLAVOUR = di
273 KERNELNAME = vmlinux
274
275=== modified file 'build/config/ppc64el/hwe-cdrom.cfg'
276--- build/config/ppc64el/hwe-cdrom.cfg 2017-11-18 19:18:44 +0000
277+++ build/config/ppc64el/hwe-cdrom.cfg 2018-02-20 08:33:10 +0000
278@@ -3,4 +3,4 @@
279
280 include config/ppc64el/cdrom.cfg
281
282-KERNELVERSION = 4.10.0-40-generic
283+KERNELVERSION = 4.13.0-36-generic
284
285=== modified file 'build/config/ppc64el/hwe-netboot.cfg'
286--- build/config/ppc64el/hwe-netboot.cfg 2017-11-18 19:18:44 +0000
287+++ build/config/ppc64el/hwe-netboot.cfg 2018-02-20 08:33:10 +0000
288@@ -3,4 +3,4 @@
289
290 include config/ppc64el/netboot.cfg
291
292-KERNELVERSION = 4.10.0-40-generic
293+KERNELVERSION = 4.13.0-36-generic
294
295=== modified file 'build/config/s390x.cfg'
296--- build/config/s390x.cfg 2017-11-18 19:18:44 +0000
297+++ build/config/s390x.cfg 2018-02-20 08:33:10 +0000
298@@ -3,7 +3,7 @@
299 KERNEL = $(DEST)/image.ubuntu
300
301 KERNELMAJOR = 2.6
302-BASEVERSION = 4.4.0-101
303+BASEVERSION = 4.4.0-116
304 KERNELVERSION = $(BASEVERSION)-generic
305 KERNEL_FLAVOUR = di
306 KERNELNAME = vmlinuz
307
308=== modified file 'build/config/s390x/hwe-generic.cfg'
309--- build/config/s390x/hwe-generic.cfg 2017-11-18 19:18:44 +0000
310+++ build/config/s390x/hwe-generic.cfg 2018-02-20 08:33:10 +0000
311@@ -3,4 +3,4 @@
312
313 include config/s390x/generic.cfg
314
315-KERNELVERSION = 4.10.0-40-generic
316+KERNELVERSION = 4.13.0-36-generic
317
318=== modified file 'debian/changelog'
319--- debian/changelog 2018-02-09 11:56:56 +0000
320+++ debian/changelog 2018-02-20 08:33:10 +0000
321@@ -1,4 +1,4 @@
322-debian-installer (20101020ubuntu451.20) UNRELEASED; urgency=medium
323+debian-installer (20101020ubuntu451.22) UNRELEASED; urgency=medium
324
325 * arm64-efi/netboot: Improvements to mini.iso generation:
326 - Add an EFI System Partition to fix booting from USB stick on
327@@ -12,6 +12,19 @@
328
329 -- dann frazier <dannf@ubuntu.com> Thu, 30 Nov 2017 12:50:14 -0700
330
331+debian-installer (20101020ubuntu451.21) xenial; urgency=medium
332+
333+ * Move hwe kernels to 4.13.0-36.
334+
335+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 20 Feb 2018 09:30:34 +0100
336+
337+debian-installer (20101020ubuntu451.20) xenial; urgency=medium
338+
339+ * Move master kernels to 4.4.0-116.
340+ * Move hwe kernels to 4.13.0-35.
341+
342+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 15 Feb 2018 18:02:24 +0100
343+
344 debian-installer (20101020ubuntu451.19) xenial; urgency=medium
345
346 * No change rebuild to pick up the latest change in preseed (LP: #1745531)

Subscribers

People subscribed via source and target branches