Merge lp:~xnox/debian-installer/xnox462 into lp:~ubuntu-core-dev/debian-installer/ubuntu

Proposed by Dimitri John Ledkov on 2016-06-27
Status: Merged
Merged at revision: 2159
Proposed branch: lp:~xnox/debian-installer/xnox462
Merge into: lp:~ubuntu-core-dev/debian-installer/ubuntu
Diff against target: 129 lines (+26/-8)
9 files modified
build/config/amd64.cfg (+1/-1)
build/config/arm64.cfg (+1/-1)
build/config/armel.cfg (+1/-1)
build/config/armhf.cfg (+1/-1)
build/config/i386.cfg (+1/-1)
build/config/powerpc.cfg (+1/-1)
build/config/ppc64el.cfg (+1/-1)
build/config/s390x.cfg (+1/-1)
debian/changelog (+18/-0)
To merge this branch: bzr merge lp:~xnox/debian-installer/xnox462
Reviewer Review Type Date Requested Status
Adam Conrad 2016-06-27 Pending
Ubuntu Core Development Team 2016-06-27 Pending
Review via email: mp+298406@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 'build/config/amd64.cfg'
2--- build/config/amd64.cfg 2016-06-10 14:24:12 +0000
3+++ build/config/amd64.cfg 2016-06-27 09:49:51 +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-24
9+BASEVERSION = 4.4.0-27
10 KERNELVERSION = $(BASEVERSION)-generic
11 KERNELMAJOR = 2.6
12 KERNEL_FLAVOUR = di
13
14=== modified file 'build/config/arm64.cfg'
15--- build/config/arm64.cfg 2016-06-10 14:24:12 +0000
16+++ build/config/arm64.cfg 2016-06-27 09:49:51 +0000
17@@ -1,7 +1,7 @@
18 MEDIUM_SUPPORTED = cdrom netboot device-tree
19
20 KERNELMAJOR = 2.6
21-KERNELVERSION = 4.4.0-24-generic
22+KERNELVERSION = 4.4.0-27-generic
23 KERNEL_FLAVOUR = di
24 KERNELIMAGEVERSION = $(KERNELVERSION)
25 KERNELNAME = vmlinuz
26
27=== modified file 'build/config/armel.cfg'
28--- build/config/armel.cfg 2016-06-10 14:24:12 +0000
29+++ build/config/armel.cfg 2016-06-27 09:49:51 +0000
30@@ -2,7 +2,7 @@
31 #SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads dove omap4
32
33 KERNELMAJOR = 2.6
34-KERNELVERSION = 4.4.0-24
35+KERNELVERSION = 4.4.0-27
36 KERNEL_FLAVOUR = di
37 KERNELIMAGEVERSION = $(KERNELVERSION)
38 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
39
40=== modified file 'build/config/armhf.cfg'
41--- build/config/armhf.cfg 2016-06-10 14:24:12 +0000
42+++ build/config/armhf.cfg 2016-06-27 09:49:51 +0000
43@@ -3,7 +3,7 @@
44 MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
45
46 KERNELMAJOR = 2.6
47-KERNELVERSION = 4.4.0-24
48+KERNELVERSION = 4.4.0-27
49 KERNEL_FLAVOUR = di
50 KERNELIMAGEVERSION = $(KERNELVERSION)
51 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
52
53=== modified file 'build/config/i386.cfg'
54--- build/config/i386.cfg 2016-06-10 14:24:12 +0000
55+++ build/config/i386.cfg 2016-06-27 09:49:51 +0000
56@@ -2,7 +2,7 @@
57 MEDIUM_SUPPORTED_EXTRA = monolithic
58
59 # The version of the kernel to use.
60-BASEVERSION = 4.4.0-24
61+BASEVERSION = 4.4.0-27
62 KERNELVERSION = $(BASEVERSION)-generic
63 KERNELMAJOR = 2.6
64 KERNEL_FLAVOUR = di
65
66=== modified file 'build/config/powerpc.cfg'
67--- build/config/powerpc.cfg 2016-06-10 14:24:12 +0000
68+++ build/config/powerpc.cfg 2016-06-27 09:49:51 +0000
69@@ -1,7 +1,7 @@
70 SUBARCH_SUPPORTED = powerpc powerpc64 e500mc # apus prep
71
72 KERNELMAJOR = 2.6
73-BASEVERSION = 4.4.0-24
74+BASEVERSION = 4.4.0-27
75
76 # create the kernels with builtin initrd.
77 builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
78
79=== modified file 'build/config/ppc64el.cfg'
80--- build/config/ppc64el.cfg 2016-06-10 14:24:12 +0000
81+++ build/config/ppc64el.cfg 2016-06-27 09:49:51 +0000
82@@ -1,7 +1,7 @@
83 MEDIUM_SUPPORTED = netboot cdrom
84
85 KERNELMAJOR = 2.6
86-BASEVERSION = 4.4.0-24
87+BASEVERSION = 4.4.0-27
88 KERNELVERSION = $(BASEVERSION)-generic
89 KERNEL_FLAVOUR = di
90 KERNELNAME = vmlinux
91
92=== modified file 'build/config/s390x.cfg'
93--- build/config/s390x.cfg 2016-06-10 14:24:12 +0000
94+++ build/config/s390x.cfg 2016-06-27 09:49:51 +0000
95@@ -3,7 +3,7 @@
96 KERNEL = $(DEST)/image.ubuntu
97
98 KERNELMAJOR = 2.6
99-BASEVERSION = 4.4.0-24
100+BASEVERSION = 4.4.0-27
101 KERNELVERSION = $(BASEVERSION)-generic
102 KERNEL_FLAVOUR = di
103 KERNELNAME = vmlinuz
104
105=== modified file 'debian/changelog'
106--- debian/changelog 2016-06-10 14:24:12 +0000
107+++ debian/changelog 2016-06-27 09:49:51 +0000
108@@ -1,3 +1,21 @@
109+debian-installer (20101020ubuntu462) yakkety; urgency=medium
110+
111+ * Rebuild with updated s390-tools. LP: #1592990.
112+
113+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 25 Jun 2016 04:29:49 +0100
114+
115+debian-installer (20101020ubuntu461) yakkety; urgency=medium
116+
117+ * Move master kernels to 4.4.0-27.
118+
119+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 21 Jun 2016 14:02:28 -0600
120+
121+debian-installer (20101020ubuntu460) yakkety; urgency=medium
122+
123+ * Move master kernels to 4.4.0-25.
124+
125+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 15 Jun 2016 00:06:37 -0600
126+
127 debian-installer (20101020ubuntu459) yakkety; urgency=medium
128
129 * Move master kernels to 4.4.0-24.

Subscribers

People subscribed via source and target branches