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
=== modified file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml 2016-08-23 15:30:05 +0000
+++ conf/meph-v3.yaml 2016-08-25 03:05:56 +0000
@@ -11,7 +11,7 @@
11# 'khdata' is an optional dictionary used to tell which dtb files to pull or11# 'khdata' is an optional dictionary used to tell which dtb files to pull or
12# what kernel helper to run on the kernel and initramfs.12# what kernel helper to run on the kernel and initramfs.
1313
14# Previous to 16.04 kernels were naming using the format14# Previous to 16.04 subarches were named using the format
15# hwe-<first letter of release>. From 16.04 onwards kernels come in the format15# hwe-<first letter of release>. From 16.04 onwards kernels come in the format
16# hwe-<release version>. Because the version has a '.' in it we keep the old16# hwe-<release version>. Because the version has a '.' in it we keep the old
17# naming format for the anchors.17# naming format for the anchors.
@@ -24,14 +24,14 @@
24 - &sa_hwe_u [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]24 - &sa_hwe_u [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
25 - &sa_hwe_v [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]25 - &sa_hwe_v [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
26 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]26 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
27 - &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]27 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04]
28 - &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]28 - &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]
29 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]29 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
30 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]30 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
31 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]31 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
32 - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]32 - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
33 - &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]33 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04]
34 - &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]34 - &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]
3535
36misc:36misc:
37 - &glpae generic-lpae37 - &glpae generic-lpae
@@ -46,65 +46,65 @@
46 release: yakkety46 release: yakkety
47 kernels:47 kernels:
48 - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]48 - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
49 - [yakkety, amd64, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
49 - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]50 - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
50 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]51 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
51 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]52 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
52 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]53 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
53 - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]54 - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
54 - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]55 - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
56 - [yakkety, i386, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
55 - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]57 - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
56 - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]58 - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
57 - version: "16.04"59 - version: "16.04"
58 release: xenial60 release: xenial
59 kernels:61 kernels:
60 - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]62 - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
61 - [xenial, amd64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]63 - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
62 - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]64 - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
63 - [xenial, arm64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
64 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]65 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
65 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]66 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
66 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]67 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
67 - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]68 - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
68 - [xenial, armhf, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *arm_hwe_x]
69 - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]69 - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
70 - [xenial, i386, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]70 - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
71 - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]71 - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
72 - [xenial, ppc64el, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
73 - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]72 - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
74 - [xenial, s390x, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
75 - version: "14.04"73 - version: "14.04"
76 builtin_kernel: linux-generic74 builtin_kernel: linux-generic
77 release: trusty75 release: trusty
78 kernels:76 kernels:
79 - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]77 - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]
80 - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]78 - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
81 - [trusty, armhf, keystone, keystone, linux-keystone, [keystone]]79 - [trusty, armhf, keystone, keystone, linux-keystone, [keystone]]
82 - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]80 - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]
83 - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]81 - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]
84 - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]82 - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]
85 - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]83 - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]
86 - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]84 - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
87 - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]85 - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
88 - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]86 - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
89 - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]87 - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
90 - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]88 - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
91 - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]89 - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
92 - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]90 - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
93 - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]91 - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
94 - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]92 - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
95 - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]93 - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
96 - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]94 - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
97 - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]95 - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
98 - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]96 - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
99 - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]97 - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
100 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]98 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
101 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]99 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
102 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]100 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
103 - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]101 - [xenial, amd64, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
104 - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]102 - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
105 - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]103 - [xenial, arm64, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
106 - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]104 - [xenial, armhf, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
107 - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]105 - [xenial, i386, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
106 - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
107 - [xenial, ppc64el, hwe-16.04, generic, linux-generic-lts-xenial, *sa_hwe_x]
108 - version: "12.04"108 - version: "12.04"
109 release: precise109 release: precise
110 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}110 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}
111111
=== modified file 'meph2/stream.py'
--- meph2/stream.py 2016-08-24 05:05:47 +0000
+++ meph2/stream.py 2016-08-25 03:05:56 +0000
@@ -146,8 +146,16 @@
146 if i not in kdata:146 if i not in kdata:
147 kdata[i] = kdata_defaults[i]147 kdata[i] = kdata_defaults[i]
148148
149 # The subarch cannot contain the kernel flavor. We add it to the
150 # product name so different kernels can be shown in the stream as
151 # part of the product name.
152 if flavor != 'generic':
153 product_psubarch = "%s-%s" % (psubarch, flavor)
154 else:
155 product_psubarch = psubarch
156
149 subs.update({'krel': krel, 'kpkg': kpkg, 'flavor': flavor,157 subs.update({'krel': krel, 'kpkg': kpkg, 'flavor': flavor,
150 'psubarch': psubarch,158 'psubarch': product_psubarch,
151 'suffix': kdata["suffix"]})159 'suffix': kdata["suffix"]})
152160
153 boot_keys = ['boot-kernel', 'boot-initrd']161 boot_keys = ['boot-kernel', 'boot-initrd']

Subscribers

People subscribed via source and target branches