Merge lp:~ltrager/maas-images/maas_images_signed_kernel into lp:maas-images
- maas_images_signed_kernel
- Merge into maas-ephemerals
Proposed by
Lee Trager
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 385 | ||||
Proposed branch: | lp:~ltrager/maas-images/maas_images_signed_kernel | ||||
Merge into: | lp:maas-images | ||||
Diff against target: |
291 lines (+55/-46) 3 files modified
bin/kpack-from-image (+11/-2) conf/meph-v2.yaml (+19/-19) conf/meph-v3.yaml (+25/-25) |
||||
To merge this branch: | bzr merge lp:~ltrager/maas-images/maas_images_signed_kernel | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Newell Jensen (community) | Approve | ||
Review via email: mp+334083@code.launchpad.net |
Commit message
LP: #1711203 - Produce streams with signed kernels on amd64
Description of the change
V3 stream: http://
V2 stream: http://
Public GPG Key: http://
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote : | # |
sorry i didnt see this earlier.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bin/kpack-from-image' |
2 | --- bin/kpack-from-image 2017-07-13 07:39:26 +0000 |
3 | +++ bin/kpack-from-image 2017-11-22 23:41:46 +0000 |
4 | @@ -377,7 +377,14 @@ |
5 | verflav=${kernel#/boot/*-} |
6 | initrd="/boot/initrd.img-$verflav" |
7 | debug 2 "verflav is $verflav" |
8 | - |
9 | + # LP: #1711203 - Prefer a signed kernel over an unsigned kernel. The signed |
10 | + # kernel is created by combining the key in /usr/lib/linux and the kernel |
11 | + # in /boot. As the kernel will not be in the dpkg database assume if it |
12 | + # exists it's what we want. |
13 | + if [ -f "$(ls $kernel*signed)" ]; then |
14 | + kernel="$(ls $kernel*signed)" |
15 | + debug 1 "Found signed kernel $kernel" |
16 | + fi |
17 | if [ "$initrd" -ot "$stamp" ]; then |
18 | debug 1 "initramfs did not update by package install. regenerating." |
19 | update-initramfs -c -k "$verflav" |
20 | @@ -386,7 +393,9 @@ |
21 | [ -f "$initrd" ] || { error "no initrd for $verflav" 1>&2; return 1; } |
22 | |
23 | local name="" t="" outf="" |
24 | - for f in /boot/*-${verflav}; do |
25 | + for f in /boot/*-${verflav}*; do |
26 | + # Skip unsigned kernel if a signed kernel is available. |
27 | + [ -f "$f"*.signed ] && continue |
28 | t=$(basename "$f") |
29 | case "$t" in |
30 | vmlinu?*) name="kernel";; |
31 | |
32 | === modified file 'conf/meph-v2.yaml' |
33 | --- conf/meph-v2.yaml 2017-11-22 20:01:54 +0000 |
34 | +++ conf/meph-v2.yaml 2017-11-22 23:41:46 +0000 |
35 | @@ -47,7 +47,7 @@ |
36 | - version: "18.04" |
37 | release: bionic |
38 | kernels: |
39 | - - [bionic, amd64, hwe-b, generic, linux-generic, *sa_hwe_b] |
40 | + - [bionic, amd64, hwe-b, generic, linux-signed-generic, *sa_hwe_b] |
41 | - [bionic, arm64, hwe-b, generic, linux-generic, *sa_hwe_b] |
42 | - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
43 | - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
44 | @@ -59,7 +59,7 @@ |
45 | - version: "17.10" |
46 | release: artful |
47 | kernels: |
48 | - - [artful, amd64, hwe-a, generic, linux-generic, *sa_hwe_a] |
49 | + - [artful, amd64, hwe-a, generic, linux-signed-generic, *sa_hwe_a] |
50 | - [artful, arm64, hwe-a, generic, linux-generic, *sa_hwe_a] |
51 | - [artful, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
52 | - [artful, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
53 | @@ -71,7 +71,7 @@ |
54 | - version: "17.04" |
55 | release: zesty |
56 | kernels: |
57 | - - [zesty, amd64, hwe-z, generic, linux-generic, *sa_hwe_z] |
58 | + - [zesty, amd64, hwe-z, generic, linux-signed-generic, *sa_hwe_z] |
59 | - [zesty, arm64, hwe-z, generic, linux-generic, *sa_hwe_z] |
60 | - [zesty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
61 | - [zesty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
62 | @@ -83,7 +83,7 @@ |
63 | - version: "16.10" |
64 | release: yakkety |
65 | kernels: |
66 | - - [yakkety, amd64, hwe-y, generic, linux-generic, *sa_hwe_y] |
67 | + - [yakkety, amd64, hwe-y, generic, linux-signed-generic, *sa_hwe_y] |
68 | - [yakkety, arm64, hwe-y, generic, linux-generic, *sa_hwe_y] |
69 | - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
70 | - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
71 | @@ -95,7 +95,7 @@ |
72 | - version: "16.04" |
73 | release: xenial |
74 | kernels: |
75 | - - [xenial, amd64, hwe-x, generic, linux-generic, *sa_hwe_x] |
76 | + - [xenial, amd64, hwe-x, generic, linux-signed-generic, *sa_hwe_x] |
77 | - [xenial, arm64, hwe-x, generic, linux-generic, *sa_hwe_x] |
78 | - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
79 | - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
80 | @@ -111,7 +111,7 @@ |
81 | - [wily, armhf, hwe-w, generic, linux-generic, *arm_hwe_w] |
82 | - [wily, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
83 | - [wily, i386, hwe-w, generic, linux-generic, *sa_hwe_w] |
84 | - - [wily, amd64, hwe-w, generic, linux-generic, *sa_hwe_w] |
85 | + - [wily, amd64, hwe-w, generic, linux-signed-generic, *sa_hwe_w] |
86 | - [wily, ppc64el, hwe-w, generic, linux-generic, *sa_hwe_w] |
87 | - [wily, arm64, hwe-w, generic, linux-generic, *sa_hwe_w] |
88 | - [wily, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
89 | @@ -123,7 +123,7 @@ |
90 | - [vivid, armhf, hwe-v, generic, linux-generic, *arm_hwe_v] |
91 | - [vivid, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
92 | - [vivid, i386, hwe-v, generic, linux-generic, *sa_hwe_v] |
93 | - - [vivid, amd64, hwe-v, generic, linux-generic, *sa_hwe_v] |
94 | + - [vivid, amd64, hwe-v, generic, linux-signed-generic, *sa_hwe_v] |
95 | - [vivid, ppc64el, hwe-v, generic, linux-generic, *sa_hwe_v] |
96 | - [vivid, arm64, hwe-v, generic, linux-generic, *sa_hwe_v] |
97 | - [vivid, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
98 | @@ -135,7 +135,7 @@ |
99 | - [utopic, armhf, hwe-u, generic, linux-generic, *arm_hwe_u] |
100 | - [utopic, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
101 | - [utopic, i386, hwe-u, generic, linux-generic, *sa_hwe_u] |
102 | - - [utopic, amd64, hwe-u, generic, linux-generic, *sa_hwe_u] |
103 | + - [utopic, amd64, hwe-u, generic, linux-signed-generic, *sa_hwe_u] |
104 | - [utopic, ppc64el, hwe-u, generic, linux-generic, *sa_hwe_u] |
105 | - [utopic, arm64, hwe-u, generic, linux-generic, *sa_hwe_u] |
106 | - [utopic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
107 | @@ -147,27 +147,27 @@ |
108 | - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t] |
109 | - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
110 | - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t] |
111 | - - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t] |
112 | + - [trusty, amd64, hwe-t, generic, linux-signed-generic, *sa_hwe_t] |
113 | - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t] |
114 | - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t] |
115 | - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
116 | - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
117 | - - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
118 | + - [utopic, amd64, hwe-u, generic, linux-signed-generic-lts-utopic, *sa_hwe_u] |
119 | - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
120 | - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
121 | - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
122 | - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
123 | - - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
124 | + - [vivid, amd64, hwe-v, generic, linux-signed-generic-lts-vivid, *sa_hwe_v] |
125 | - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
126 | - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
127 | - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
128 | - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
129 | - - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
130 | + - [wily, amd64, hwe-w, generic, linux-signed-generic-lts-wily, *sa_hwe_w] |
131 | - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
132 | - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
133 | - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
134 | - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
135 | - - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x] |
136 | + - [xenial, amd64, hwe-x, generic, linux-signed-generic-lts-xenial, *sa_hwe_x] |
137 | - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x] |
138 | - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x] |
139 | - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x] |
140 | @@ -179,22 +179,22 @@ |
141 | - [saucy, armhf, hwe-s, generic, linux-generic, *sa_hwe_s] |
142 | - [saucy, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
143 | - [saucy, i386, hwe-s, generic, linux-generic, *sa_hwe_t] |
144 | - - [saucy, amd64, hwe-s, generic, linux-generic, *sa_hwe_t] |
145 | + - [saucy, amd64, hwe-s, generic, linux-signed-generic, *sa_hwe_t] |
146 | - version: "12.04" |
147 | release: precise |
148 | builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'} |
149 | kernels: |
150 | - [precise, i386, hwe-p, generic, linux-generic, *sa_hwe_p] |
151 | - - [precise, amd64, hwe-p, generic, linux-generic, *sa_hwe_p] |
152 | + - [precise, amd64, hwe-p, generic, linux-signed-generic, *sa_hwe_p] |
153 | - [precise, armhf, highbank, highbank, linux-highbank, [highbank]] |
154 | - [quantal, i386, hwe-q, generic, linux-generic-lts-quantal, *sa_hwe_q] |
155 | - - [quantal, amd64, hwe-q, generic, linux-generic-lts-quantal, *sa_hwe_q] |
156 | + - [quantal, amd64, hwe-q, generic, linux-signed-generic-lts-quantal, *sa_hwe_q] |
157 | - [raring, i386, hwe-r, generic, linux-generic-lts-raring, *sa_hwe_r] |
158 | - - [raring, amd64, hwe-r, generic, linux-generic-lts-raring, *sa_hwe_r] |
159 | + - [raring, amd64, hwe-r, generic, linux-signed-generic-lts-raring, *sa_hwe_r] |
160 | - [saucy, i386, hwe-s, generic, linux-generic-lts-saucy, *sa_hwe_s] |
161 | - - [saucy, amd64, hwe-s, generic, linux-generic-lts-saucy, *sa_hwe_s] |
162 | + - [saucy, amd64, hwe-s, generic, linux-signed-generic-lts-saucy, *sa_hwe_s] |
163 | - [trusty, i386, hwe-t, generic, linux-generic-lts-trusty, *sa_hwe_t] |
164 | - - [trusty, amd64, hwe-t, generic, linux-generic-lts-trusty, *sa_hwe_t] |
165 | + - [trusty, amd64, hwe-t, generic, linux-signed-generic-lts-trusty, *sa_hwe_t] |
166 | |
167 | # enable_proposed: True |
168 | |
169 | |
170 | === modified file 'conf/meph-v3.yaml' |
171 | --- conf/meph-v3.yaml 2017-11-22 20:01:54 +0000 |
172 | +++ conf/meph-v3.yaml 2017-11-22 23:41:46 +0000 |
173 | @@ -54,8 +54,8 @@ |
174 | - version: "18.04" |
175 | release: bionic |
176 | kernels: |
177 | - - [bionic, amd64, ga-18.04, generic, linux-generic, *sa_hwe_b] |
178 | - - [bionic, amd64, ga-18.04, lowlatency, linux-image-lowlatency, *sa_hwe_b] |
179 | + - [bionic, amd64, ga-18.04, generic, linux-signed-generic, *sa_hwe_b] |
180 | + - [bionic, amd64, ga-18.04, lowlatency, linux-signed-image-lowlatency, *sa_hwe_b] |
181 | - [bionic, arm64, ga-18.04, generic, linux-generic, *sa_hwe_b] |
182 | - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
183 | - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
184 | @@ -68,8 +68,8 @@ |
185 | - version: "17.10" |
186 | release: artful |
187 | kernels: |
188 | - - [artful, amd64, ga-17.10, generic, linux-generic, *sa_hwe_a] |
189 | - - [artful, amd64, ga-17.10, lowlatency, linux-image-lowlatency, *sa_hwe_a] |
190 | + - [artful, amd64, ga-17.10, generic, linux-signed-generic, *sa_hwe_a] |
191 | + - [artful, amd64, ga-17.10, lowlatency, linux-signed-image-lowlatency, *sa_hwe_a] |
192 | - [artful, arm64, ga-17.10, generic, linux-generic, *sa_hwe_a] |
193 | - [artful, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
194 | - [artful, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
195 | @@ -82,8 +82,8 @@ |
196 | - version: "17.04" |
197 | release: zesty |
198 | kernels: |
199 | - - [zesty, amd64, ga-17.04, generic, linux-generic, *sa_hwe_z] |
200 | - - [zesty, amd64, ga-17.04, lowlatency, linux-image-lowlatency, *sa_hwe_z] |
201 | + - [zesty, amd64, ga-17.04, generic, linux-signed-generic, *sa_hwe_z] |
202 | + - [zesty, amd64, ga-17.04, lowlatency, linux-signed-image-lowlatency, *sa_hwe_z] |
203 | - [zesty, arm64, ga-17.04, generic, linux-generic, *sa_hwe_z] |
204 | - [zesty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
205 | - [zesty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
206 | @@ -96,8 +96,8 @@ |
207 | - version: "16.10" |
208 | release: yakkety |
209 | kernels: |
210 | - - [yakkety, amd64, ga-16.10, generic, linux-generic, *sa_hwe_y] |
211 | - - [yakkety, amd64, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y] |
212 | + - [yakkety, amd64, ga-16.10, generic, linux-signed-generic, *sa_hwe_y] |
213 | + - [yakkety, amd64, ga-16.10, lowlatency, linux-signed-image-lowlatency, *sa_hwe_y] |
214 | - [yakkety, arm64, ga-16.10, generic, linux-generic, *sa_hwe_y] |
215 | - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
216 | - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
217 | @@ -110,12 +110,12 @@ |
218 | - version: "16.04" |
219 | release: xenial |
220 | kernels: |
221 | - - [xenial, amd64, ga-16.04, generic, linux-generic, *sa_hwe_x] |
222 | - - [xenial, amd64, ga-16.04, lowlatency, linux-lowlatency, *sa_hwe_x] |
223 | - - [xenial, amd64, hwe-16.04, generic, linux-generic-hwe-16.04, *sa_hwe_x] |
224 | - - [xenial, amd64, hwe-16.04, lowlatency, linux-lowlatency-hwe-16.04, *sa_hwe_x] |
225 | - - [xenial, amd64, hwe-16.04-edge, generic, linux-generic-hwe-16.04-edge, *sa_hwe_x_edge] |
226 | - - [xenial, amd64, hwe-16.04-edge, lowlatency, linux-lowlatency-hwe-16.04-edge, *sa_hwe_x_edge] |
227 | + - [xenial, amd64, ga-16.04, generic, linux-signed-generic, *sa_hwe_x] |
228 | + - [xenial, amd64, ga-16.04, lowlatency, linux-signed-lowlatency, *sa_hwe_x] |
229 | + - [xenial, amd64, hwe-16.04, generic, linux-signed-generic-hwe-16.04, *sa_hwe_x] |
230 | + - [xenial, amd64, hwe-16.04, lowlatency, linux-signed-lowlatency-hwe-16.04, *sa_hwe_x] |
231 | + - [xenial, amd64, hwe-16.04-edge, generic, linux-signed-generic-hwe-16.04-edge, *sa_hwe_x_edge] |
232 | + - [xenial, amd64, hwe-16.04-edge, lowlatency, linux-signed-lowlatency-hwe-16.04-edge, *sa_hwe_x_edge] |
233 | - [xenial, arm64, ga-16.04, generic, linux-generic, *sa_hwe_x] |
234 | - [xenial, arm64, hwe-16.04, generic, linux-generic-hwe-16.04, *sa_hwe_x] |
235 | - [xenial, arm64, hwe-16.04-edge, generic, linux-generic-hwe-16.04-edge, *sa_hwe_x_edge] |
236 | @@ -144,28 +144,28 @@ |
237 | - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t] |
238 | - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]] |
239 | - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t] |
240 | - - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t] |
241 | + - [trusty, amd64, hwe-t, generic, linux-signed-generic, *sa_hwe_t] |
242 | - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t] |
243 | - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t] |
244 | - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene] |
245 | - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang] |
246 | - - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
247 | + - [utopic, amd64, hwe-u, generic, linux-signed-generic-lts-utopic, *sa_hwe_u] |
248 | - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
249 | - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
250 | - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
251 | - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u] |
252 | - - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
253 | + - [vivid, amd64, hwe-v, generic, linux-signed-generic-lts-vivid, *sa_hwe_v] |
254 | - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
255 | - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
256 | - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
257 | - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v] |
258 | - - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
259 | + - [wily, amd64, hwe-w, generic, linux-signed-generic-lts-wily, *sa_hwe_w] |
260 | - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
261 | - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
262 | - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
263 | - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w] |
264 | - - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy] |
265 | - - [xenial, amd64, hwe-x, lowlatency, linux-lowlatency, *sa_hwe_x_legacy] |
266 | + - [xenial, amd64, hwe-x, generic, linux-signed-generic-lts-xenial, *sa_hwe_x_legacy] |
267 | + - [xenial, amd64, hwe-x, lowlatency, linux-signed-lowlatency-lts-xenial, *sa_hwe_x_legacy] |
268 | - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy] |
269 | - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy] |
270 | - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy] |
271 | @@ -176,16 +176,16 @@ |
272 | builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'} |
273 | kernels: |
274 | - [precise, i386, hwe-p, generic, linux-generic, *sa_hwe_p] |
275 | - - [precise, amd64, hwe-p, generic, linux-generic, *sa_hwe_p] |
276 | + - [precise, amd64, hwe-p, generic, linux-signed-generic, *sa_hwe_p] |
277 | - [precise, armhf, highbank, highbank, linux-highbank, [highbank]] |
278 | - [quantal, i386, hwe-q, generic, linux-generic-lts-quantal, *sa_hwe_q] |
279 | - - [quantal, amd64, hwe-q, generic, linux-generic-lts-quantal, *sa_hwe_q] |
280 | + - [quantal, amd64, hwe-q, generic, linux-signed-generic-lts-quantal, *sa_hwe_q] |
281 | - [raring, i386, hwe-r, generic, linux-generic-lts-raring, *sa_hwe_r] |
282 | - - [raring, amd64, hwe-r, generic, linux-generic-lts-raring, *sa_hwe_r] |
283 | + - [raring, amd64, hwe-r, generic, linux-signed-generic-lts-raring, *sa_hwe_r] |
284 | - [saucy, i386, hwe-s, generic, linux-generic-lts-saucy, *sa_hwe_s] |
285 | - - [saucy, amd64, hwe-s, generic, linux-generic-lts-saucy, *sa_hwe_s] |
286 | + - [saucy, amd64, hwe-s, generic, linux-signed-generic-lts-saucy, *sa_hwe_s] |
287 | - [trusty, i386, hwe-t, generic, linux-generic-lts-trusty, *sa_hwe_t] |
288 | - - [trusty, amd64, hwe-t, generic, linux-generic-lts-trusty, *sa_hwe_t] |
289 | + - [trusty, amd64, hwe-t, generic, linux-signed-generic-lts-trusty, *sa_hwe_t] |
290 | |
291 | # enable_proposed: True |
292 |
LGTM, one small comment below on wording.