maas-images

Merge lp:~ltrager/maas-images/lowlatency_kernels into lp:maas-images

  1. lowlatency_kernels
  2. Merge into maas-ephemerals
Proposed by Lee Trager
Status: Merged
Merged at revision: 326
Proposed branch: lp:~ltrager/maas-images/lowlatency_kernels
Merge into: lp:maas-images
Diff against target: 154 lines (+49/-41)
2 files modified
conf/meph-v3.yaml (+40/-40)
meph2/stream.py (+9/-1)
To merge this branch: bzr merge lp:~ltrager/maas-images/lowlatency_kernels
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Review via email: mp+303890@code.launchpad.net

Description of the change

Only add the non-generic kflavor to the product name and not in the subarch. I'll add support for rolling and edge kernels in subsequent MPs.

Sample: http://paste.ubuntu.com/23087190/

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

i think this looks sane.
I dont love the large white space change in trusty: . you could avoid that by adding an anchor for hwe1604 or something, but this should hopefully be about the last change to 14.04, so its fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/meph-v3.yaml'
2--- conf/meph-v3.yaml 2016-08-23 15:30:05 +0000
3+++ conf/meph-v3.yaml 2016-08-25 03:05:56 +0000
4@@ -11,7 +11,7 @@
5 # 'khdata' is an optional dictionary used to tell which dtb files to pull or
6 # what kernel helper to run on the kernel and initramfs.
7
8-# Previous to 16.04 kernels were naming using the format
9+# Previous to 16.04 subarches were named using the format
10 # hwe-<first letter of release>. From 16.04 onwards kernels come in the format
11 # hwe-<release version>. Because the version has a '.' in it we keep the old
12 # naming format for the anchors.
13@@ -24,14 +24,14 @@
14 - &sa_hwe_u [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
15 - &sa_hwe_v [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
16 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
17- - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency]
18- - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency, hwe-16.10]
19+ - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04]
20+ - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.10]
21 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
22 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
23 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
24 - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
25- - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency]
26- - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency, hwe-16.10]
27+ - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04]
28+ - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.10]
29
30 misc:
31 - &glpae generic-lpae
32@@ -46,65 +46,65 @@
33 release: yakkety
34 kernels:
35 - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
36+ - [yakkety, amd64, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
37 - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
38 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
39 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
40 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
41 - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
42 - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
43+ - [yakkety, i386, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
44 - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
45 - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
46 - version: "16.04"
47 release: xenial
48 kernels:
49 - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
50- - [xenial, amd64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
51+ - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
52 - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
53- - [xenial, arm64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
54 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
55 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
56 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
57 - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
58- - [xenial, armhf, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *arm_hwe_x]
59 - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
60- - [xenial, i386, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
61+ - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
62 - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
63- - [xenial, ppc64el, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
64 - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
65- - [xenial, s390x, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
66 - version: "14.04"
67 builtin_kernel: linux-generic
68 release: trusty
69 kernels:
70- - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]
71- - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
72- - [trusty, armhf, keystone, keystone, linux-keystone, [keystone]]
73- - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]
74- - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]
75- - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]
76- - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]
77- - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
78- - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
79- - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
80- - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
81- - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
82- - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
83- - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
84- - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
85- - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
86- - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
87- - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
88- - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
89- - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
90- - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
91- - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
92- - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
93- - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
94- - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
95- - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
96- - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
97- - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
98- - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
99+ - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]
100+ - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
101+ - [trusty, armhf, keystone, keystone, linux-keystone, [keystone]]
102+ - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]
103+ - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]
104+ - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]
105+ - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]
106+ - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
107+ - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
108+ - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
109+ - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
110+ - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
111+ - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
112+ - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
113+ - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
114+ - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
115+ - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
116+ - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
117+ - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
118+ - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
119+ - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
120+ - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
121+ - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
122+ - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
123+ - [xenial, amd64, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
124+ - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
125+ - [xenial, arm64, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
126+ - [xenial, armhf, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
127+ - [xenial, i386, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
128+ - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
129+ - [xenial, ppc64el, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
130 - version: "12.04"
131 release: precise
132 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}
133
134=== modified file 'meph2/stream.py'
135--- meph2/stream.py 2016-08-24 05:05:47 +0000
136+++ meph2/stream.py 2016-08-25 03:05:56 +0000
137@@ -146,8 +146,16 @@
138 if i not in kdata:
139 kdata[i] = kdata_defaults[i]
140
141+ # The subarch cannot contain the kernel flavor. We add it to the
142+ # product name so different kernels can be shown in the stream as
143+ # part of the product name.
144+ if flavor != 'generic':
145+ product_psubarch = "%s-%s" % (psubarch, flavor)
146+ else:
147+ product_psubarch = psubarch
148+
149 subs.update({'krel': krel, 'kpkg': kpkg, 'flavor': flavor,
150- 'psubarch': psubarch,
151+ 'psubarch': product_psubarch,
152 'suffix': kdata["suffix"]})
153
154 boot_keys = ['boot-kernel', 'boot-initrd']

Subscribers

People subscribed via source and target branches