ubiquity

Merge ~xnox/ubiquity:oemhwe-22.04 into ubiquity:master

  1. Git
  2. lp:~xnox/ubiquity
  3. oemhwe-22.04
  4. Merge into master
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 5cbe145cb4e41c0bde621c727b4916978415e82e
Proposed branch: ~xnox/ubiquity:oemhwe-22.04
Merge into: ubiquity:master
Diff against target: 335 lines (+71/-65)
14 files modified
d-i/source/base-installer/kernel/amd64.sh (+9/-9)
d-i/source/base-installer/kernel/arm64.sh (+5/-5)
d-i/source/base-installer/kernel/ppc64el.sh (+5/-5)
d-i/source/base-installer/kernel/s390x.sh (+5/-5)
d-i/source/base-installer/kernel/tests/amd64/cittagazze.test (+9/-9)
d-i/source/base-installer/kernel/tests/arm64/foundation.test (+5/-5)
d-i/source/base-installer/kernel/tests/arm64/mustang.test (+5/-5)
d-i/source/base-installer/kernel/tests/arm64/qemu-virt.test (+5/-5)
d-i/source/base-installer/kernel/tests/ppc64el/postal.test (+5/-5)
d-i/source/base-installer/kernel/tests/ppc64el/powernv.test (+5/-5)
d-i/source/base-installer/kernel/tests/s390x/iic.test (+5/-5)
d-i/source/base-installer/library.sh (+1/-1)
debian/changelog (+6/-0)
scripts/check-kernels (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+417738@code.launchpad.net

Commit message

Switch to oem-22.04 and hwe-22.04 flavours.

Needs linux kernel to migrate.

To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Just want to chime in and ask that also <https://launchpad.net/bugs/1966530> gets fixed before next ubiquity upload.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Kernels migrated thus this should be landing now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/d-i/source/base-installer/kernel/amd64.sh b/d-i/source/base-installer/kernel/amd64.sh
2index 6a12b70..0d2a975 100644
3--- a/d-i/source/base-installer/kernel/amd64.sh
4+++ b/d-i/source/base-installer/kernel/amd64.sh
5@@ -19,23 +19,23 @@ arch_get_kernel () {
6 echo "linux-generic"
7 echo "linux-image-generic"
8
9- echo "linux-generic-hwe-20.04"
10- echo "linux-image-generic-hwe-20.04"
11+ echo "linux-generic-hwe-22.04"
12+ echo "linux-image-generic-hwe-22.04"
13
14 echo "linux-lowlatency"
15 echo "linux-image-lowlatency"
16
17- echo "linux-lowlatency-hwe-20.04"
18- echo "linux-image-lowlatency-hwe-20.04"
19+ echo "linux-lowlatency-hwe-22.04"
20+ echo "linux-image-lowlatency-hwe-22.04"
21
22- echo "linux-oem-20.04"
23- echo "linux-image-oem-20.04"
24+ echo "linux-oem-22.04"
25+ echo "linux-image-oem-22.04"
26
27 echo "linux-virtual"
28 echo "linux-image-virtual"
29 echo "linux-image-extra-virtual"
30
31- echo "linux-virtual-hwe-20.04"
32- echo "linux-image-virtual-hwe-20.04"
33- echo "linux-image-extra-virtual-hwe-20.04"
34+ echo "linux-virtual-hwe-22.04"
35+ echo "linux-image-virtual-hwe-22.04"
36+ echo "linux-image-extra-virtual-hwe-22.04"
37 }
38diff --git a/d-i/source/base-installer/kernel/arm64.sh b/d-i/source/base-installer/kernel/arm64.sh
39index 95805d0..e57c8e1 100644
40--- a/d-i/source/base-installer/kernel/arm64.sh
41+++ b/d-i/source/base-installer/kernel/arm64.sh
42@@ -11,8 +11,8 @@ arch_get_kernel () {
43 echo "linux-generic"
44 echo "linux-image-generic"
45
46- echo "linux-generic-hwe-20.04"
47- echo "linux-image-generic-hwe-20.04"
48+ echo "linux-generic-hwe-22.04"
49+ echo "linux-image-generic-hwe-22.04"
50
51 echo "linux-raspi"
52 echo "linux-image-raspi"
53@@ -21,8 +21,8 @@ arch_get_kernel () {
54 echo "linux-image-virtual"
55 echo "linux-image-extra-virtual"
56
57- echo "linux-virtual-hwe-20.04"
58- echo "linux-image-virtual-hwe-20.04"
59- echo "linux-image-extra-virtual-hwe-20.04"
60+ echo "linux-virtual-hwe-22.04"
61+ echo "linux-image-virtual-hwe-22.04"
62+ echo "linux-image-extra-virtual-hwe-22.04"
63
64 }
65diff --git a/d-i/source/base-installer/kernel/ppc64el.sh b/d-i/source/base-installer/kernel/ppc64el.sh
66index afda1bb..b93a2b1 100644
67--- a/d-i/source/base-installer/kernel/ppc64el.sh
68+++ b/d-i/source/base-installer/kernel/ppc64el.sh
69@@ -11,14 +11,14 @@ arch_get_kernel () {
70 echo "linux-generic"
71 echo "linux-image-generic"
72
73- echo "linux-generic-hwe-20.04"
74- echo "linux-image-generic-hwe-20.04"
75+ echo "linux-generic-hwe-22.04"
76+ echo "linux-image-generic-hwe-22.04"
77
78 echo "linux-virtual"
79 echo "linux-image-virtual"
80 echo "linux-image-extra-virtual"
81
82- echo "linux-virtual-hwe-20.04"
83- echo "linux-image-virtual-hwe-20.04"
84- echo "linux-image-extra-virtual-hwe-20.04"
85+ echo "linux-virtual-hwe-22.04"
86+ echo "linux-image-virtual-hwe-22.04"
87+ echo "linux-image-extra-virtual-hwe-22.04"
88 }
89diff --git a/d-i/source/base-installer/kernel/s390x.sh b/d-i/source/base-installer/kernel/s390x.sh
90index 56a94c2..6506485 100644
91--- a/d-i/source/base-installer/kernel/s390x.sh
92+++ b/d-i/source/base-installer/kernel/s390x.sh
93@@ -13,14 +13,14 @@ arch_get_kernel () {
94 echo "linux-generic"
95 echo "linux-image-generic"
96
97- echo "linux-generic-hwe-20.04"
98- echo "linux-image-generic-hwe-20.04"
99+ echo "linux-generic-hwe-22.04"
100+ echo "linux-image-generic-hwe-22.04"
101
102 echo "linux-virtual"
103 echo "linux-image-virtual"
104 echo "linux-image-extra-virtual"
105
106- echo "linux-virtual-hwe-20.04"
107- echo "linux-image-virtual-hwe-20.04"
108- echo "linux-image-extra-virtual-hwe-20.04"
109+ echo "linux-virtual-hwe-22.04"
110+ echo "linux-image-virtual-hwe-22.04"
111+ echo "linux-image-extra-virtual-hwe-22.04"
112 }
113diff --git a/d-i/source/base-installer/kernel/tests/amd64/cittagazze.test b/d-i/source/base-installer/kernel/tests/amd64/cittagazze.test
114index fbb3153..13d17d9 100644
115--- a/d-i/source/base-installer/kernel/tests/amd64/cittagazze.test
116+++ b/d-i/source/base-installer/kernel/tests/amd64/cittagazze.test
117@@ -4,20 +4,20 @@ flavour amd64
118 kernel-2.6 \
119 linux-generic \
120 linux-image-generic \
121- linux-generic-hwe-20.04 \
122- linux-image-generic-hwe-20.04 \
123+ linux-generic-hwe-22.04 \
124+ linux-image-generic-hwe-22.04 \
125 linux-lowlatency \
126 linux-image-lowlatency \
127- linux-lowlatency-hwe-20.04 \
128- linux-image-lowlatency-hwe-20.04 \
129- linux-oem-20.04 \
130- linux-image-oem-20.04 \
131+ linux-lowlatency-hwe-22.04 \
132+ linux-image-lowlatency-hwe-22.04 \
133+ linux-oem-22.04 \
134+ linux-image-oem-22.04 \
135 linux-virtual \
136 linux-image-virtual \
137 linux-image-extra-virtual \
138- linux-virtual-hwe-20.04 \
139- linux-image-virtual-hwe-20.04 \
140- linux-image-extra-virtual-hwe-20.04
141+ linux-virtual-hwe-22.04 \
142+ linux-image-virtual-hwe-22.04 \
143+ linux-image-extra-virtual-hwe-22.04
144 usable \
145 linux-generic \
146 linux-server \
147diff --git a/d-i/source/base-installer/kernel/tests/arm64/foundation.test b/d-i/source/base-installer/kernel/tests/arm64/foundation.test
148index e690945..4c20159 100644
149--- a/d-i/source/base-installer/kernel/tests/arm64/foundation.test
150+++ b/d-i/source/base-installer/kernel/tests/arm64/foundation.test
151@@ -6,16 +6,16 @@ machine generic
152 kernel-3.10 \
153 linux-generic \
154 linux-image-generic \
155- linux-generic-hwe-20.04 \
156- linux-image-generic-hwe-20.04 \
157+ linux-generic-hwe-22.04 \
158+ linux-image-generic-hwe-22.04 \
159 linux-raspi \
160 linux-image-raspi \
161 linux-virtual \
162 linux-image-virtual \
163 linux-image-extra-virtual \
164- linux-virtual-hwe-20.04 \
165- linux-image-virtual-hwe-20.04 \
166- linux-image-extra-virtual-hwe-20.04
167+ linux-virtual-hwe-22.04 \
168+ linux-image-virtual-hwe-22.04 \
169+ linux-image-extra-virtual-hwe-22.04
170 usable \
171 linux-generic \
172 linux-image-generic \
173diff --git a/d-i/source/base-installer/kernel/tests/arm64/mustang.test b/d-i/source/base-installer/kernel/tests/arm64/mustang.test
174index 138c477..d922a87 100644
175--- a/d-i/source/base-installer/kernel/tests/arm64/mustang.test
176+++ b/d-i/source/base-installer/kernel/tests/arm64/mustang.test
177@@ -6,16 +6,16 @@ machine generic
178 kernel-3.10 \
179 linux-generic \
180 linux-image-generic \
181- linux-generic-hwe-20.04 \
182- linux-image-generic-hwe-20.04 \
183+ linux-generic-hwe-22.04 \
184+ linux-image-generic-hwe-22.04 \
185 linux-raspi \
186 linux-image-raspi \
187 linux-virtual \
188 linux-image-virtual \
189 linux-image-extra-virtual \
190- linux-virtual-hwe-20.04 \
191- linux-image-virtual-hwe-20.04 \
192- linux-image-extra-virtual-hwe-20.04
193+ linux-virtual-hwe-22.04 \
194+ linux-image-virtual-hwe-22.04 \
195+ linux-image-extra-virtual-hwe-22.04
196 usable \
197 linux-generic \
198 linux-image-generic \
199diff --git a/d-i/source/base-installer/kernel/tests/arm64/qemu-virt.test b/d-i/source/base-installer/kernel/tests/arm64/qemu-virt.test
200index 04cf787..02e37c4 100644
201--- a/d-i/source/base-installer/kernel/tests/arm64/qemu-virt.test
202+++ b/d-i/source/base-installer/kernel/tests/arm64/qemu-virt.test
203@@ -6,16 +6,16 @@ machine generic
204 kernel-3.10 \
205 linux-generic \
206 linux-image-generic \
207- linux-generic-hwe-20.04 \
208- linux-image-generic-hwe-20.04 \
209+ linux-generic-hwe-22.04 \
210+ linux-image-generic-hwe-22.04 \
211 linux-raspi \
212 linux-image-raspi \
213 linux-virtual \
214 linux-image-virtual \
215 linux-image-extra-virtual \
216- linux-virtual-hwe-20.04 \
217- linux-image-virtual-hwe-20.04 \
218- linux-image-extra-virtual-hwe-20.04
219+ linux-virtual-hwe-22.04 \
220+ linux-image-virtual-hwe-22.04 \
221+ linux-image-extra-virtual-hwe-22.04
222 usable \
223 linux-generic \
224 linux-image-generic \
225diff --git a/d-i/source/base-installer/kernel/tests/ppc64el/postal.test b/d-i/source/base-installer/kernel/tests/ppc64el/postal.test
226index bad8b0b..1773532 100644
227--- a/d-i/source/base-installer/kernel/tests/ppc64el/postal.test
228+++ b/d-i/source/base-installer/kernel/tests/ppc64el/postal.test
229@@ -5,14 +5,14 @@ flavour generic
230 kernel-2.6 \
231 linux-generic \
232 linux-image-generic \
233- linux-generic-hwe-20.04 \
234- linux-image-generic-hwe-20.04 \
235+ linux-generic-hwe-22.04 \
236+ linux-image-generic-hwe-22.04 \
237 linux-virtual \
238 linux-image-virtual \
239 linux-image-extra-virtual \
240- linux-virtual-hwe-20.04 \
241- linux-image-virtual-hwe-20.04 \
242- linux-image-extra-virtual-hwe-20.04
243+ linux-virtual-hwe-22.04 \
244+ linux-image-virtual-hwe-22.04 \
245+ linux-image-extra-virtual-hwe-22.04
246 usable \
247 linux-image-generic \
248 linux-image-3.14-1-generic
249diff --git a/d-i/source/base-installer/kernel/tests/ppc64el/powernv.test b/d-i/source/base-installer/kernel/tests/ppc64el/powernv.test
250index 54e00ae..9a9697a 100644
251--- a/d-i/source/base-installer/kernel/tests/ppc64el/powernv.test
252+++ b/d-i/source/base-installer/kernel/tests/ppc64el/powernv.test
253@@ -5,14 +5,14 @@ flavour generic
254 kernel-2.6 \
255 linux-generic \
256 linux-image-generic \
257- linux-generic-hwe-20.04 \
258- linux-image-generic-hwe-20.04 \
259+ linux-generic-hwe-22.04 \
260+ linux-image-generic-hwe-22.04 \
261 linux-virtual \
262 linux-image-virtual \
263 linux-image-extra-virtual \
264- linux-virtual-hwe-20.04 \
265- linux-image-virtual-hwe-20.04 \
266- linux-image-extra-virtual-hwe-20.04
267+ linux-virtual-hwe-22.04 \
268+ linux-image-virtual-hwe-22.04 \
269+ linux-image-extra-virtual-hwe-22.04
270 usable \
271 linux-image-generic \
272 linux-image-3.14-1-generic
273diff --git a/d-i/source/base-installer/kernel/tests/s390x/iic.test b/d-i/source/base-installer/kernel/tests/s390x/iic.test
274index 57ea12d..b7b4ab0 100644
275--- a/d-i/source/base-installer/kernel/tests/s390x/iic.test
276+++ b/d-i/source/base-installer/kernel/tests/s390x/iic.test
277@@ -5,13 +5,13 @@ majors 2.6
278 kernel-2.6 \
279 linux-generic \
280 linux-image-generic \
281- linux-generic-hwe-20.04 \
282- linux-image-generic-hwe-20.04 \
283+ linux-generic-hwe-22.04 \
284+ linux-image-generic-hwe-22.04 \
285 linux-virtual \
286 linux-image-virtual \
287 linux-image-extra-virtual \
288- linux-virtual-hwe-20.04 \
289- linux-image-virtual-hwe-20.04 \
290- linux-image-extra-virtual-hwe-20.04
291+ linux-virtual-hwe-22.04 \
292+ linux-image-virtual-hwe-22.04 \
293+ linux-image-extra-virtual-hwe-22.04
294 usable \
295 linux-image-generic
296diff --git a/d-i/source/base-installer/library.sh b/d-i/source/base-installer/library.sh
297index 729ec21..761b844 100644
298--- a/d-i/source/base-installer/library.sh
299+++ b/d-i/source/base-installer/library.sh
300@@ -358,7 +358,7 @@ kernel_update_list () {
301 (set +e;
302 # Hack to get the metapackages in the right order; should be
303 # replaced by something better at some point.
304- chroot /target apt-cache search ^linux- | grep '^linux-\(amd64\|686\|k7\|generic\|lowlatency\|server\|virtual\|preempt\|rt\|xen\|oem-20.04\|power\|cell\|omap\|omap4\|keystone\)';
305+ chroot /target apt-cache search ^linux- | grep '^linux-\(amd64\|686\|k7\|generic\|lowlatency\|server\|virtual\|preempt\|rt\|xen\|oem-22.04\|power\|cell\|omap\|omap4\|keystone\)';
306 chroot /target apt-cache search ^linux-image- | grep -v '^linux-image-[2-9]\.';
307 chroot /target apt-cache search ^kfreebsd-image;
308 chroot /target apt-cache search ^gnumach-image) | \
309diff --git a/debian/changelog b/debian/changelog
310index f27523d..d85131b 100644
311--- a/debian/changelog
312+++ b/debian/changelog
313@@ -1,3 +1,9 @@
314+ubiquity (22.04.10) UNRELEASED; urgency=medium
315+
316+ * Switch kernel flavours [oem|hwe]-20.04 to [oem|hwe]-22.04.
317+
318+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Mon, 28 Mar 2022 11:40:08 +0100
319+
320 ubiquity (22.04.9) jammy; urgency=medium
321
322 * There was one fix too many in the previous changes to the Kubuntu frontend
323diff --git a/scripts/check-kernels b/scripts/check-kernels
324index 9dcf354..43351b6 100755
325--- a/scripts/check-kernels
326+++ b/scripts/check-kernels
327@@ -115,7 +115,7 @@ if [ -z "$compatible" ] && [ -z "$install_new" ]; then
328 done
329 fi
330
331-OEM_KERNEL=linux-oem-20.04
332+OEM_KERNEL=linux-oem-22.04
333 wants_oem_kernel() {
334 if [ "$(apt-cache search -n "^${OEM_KERNEL}\$")" ]; then
335 test -e /run/ubuntu-drivers-oem.autoinstall || return 1

Subscribers

People subscribed via source and target branches