Merge lp:~cypressyew/ubuntu-cve-tracker/add-linux-euclid into lp:~ubuntu-security/ubuntu-cve-tracker/master

Proposed by Po-Hsu Lin
Status: Merged
Merged at revision: 13268
Proposed branch: lp:~cypressyew/ubuntu-cve-tracker/add-linux-euclid
Merge into: lp:~ubuntu-security/ubuntu-cve-tracker/master
Diff against target: 69 lines (+14/-1)
4 files modified
active/00boilerplate.linux (+9/-0)
scripts/cve_lib.py (+3/-0)
scripts/prepare-kernel-usn.py (+1/-1)
scripts/sis-generate-usn (+1/-0)
To merge this branch: bzr merge lp:~cypressyew/ubuntu-cve-tracker/add-linux-euclid
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Ubuntu Security Team Pending
Review via email: mp+329879@code.launchpad.net

Description of the change

Add Intel-Euclid kernel to the tracker.

To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

Thanks, I've gone ahead an merged this, along with a followup commit after running the add-derived-kernel script, which added fields for linux-euclid in all of the active kernel cve entries.

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Oh cool,
nice to know there is a tool for this.
Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'active/00boilerplate.linux'
2--- active/00boilerplate.linux 2017-08-16 16:42:55 +0000
3+++ active/00boilerplate.linux 2017-08-30 05:17:10 +0000
4@@ -287,3 +287,12 @@
5 xenial_linux-kvm: needs-triage
6 zesty_linux-kvm: DNE
7 devel_linux-kvm: DNE
8+
9+Patches_linux-euclid:
10+upstream_linux-euclid: needs-triage
11+precise/esm_linux-euclid: DNE
12+trusty_linux-euclid: DNE
13+vivid/ubuntu-core_linux-euclid: DNE
14+xenial_linux-euclid: needs-triage
15+zesty_linux-euclid: DNE
16+devel_linux-euclid: DNE
17
18=== modified file 'scripts/cve_lib.py'
19--- scripts/cve_lib.py 2017-08-24 11:58:38 +0000
20+++ scripts/cve_lib.py 2017-08-30 05:17:10 +0000
21@@ -148,6 +148,7 @@
22 'linux-gcp',
23 'linux-gke',
24 'linux-kvm',
25+ 'linux-euclid',
26 'linux-lts-quantal',
27 'linux-lts-raring',
28 'linux-lts-saucy',
29@@ -316,6 +317,7 @@
30 'linux-gcp': 'Linux kernel for XXX (XXX) systems',
31 'linux-gke': 'Linux kernel for Google Container Engine (GKE) systems',
32 'linux-kvm': 'Linux kernel for cloud environments',
33+ 'linux-euclid': 'Linux kernel for Intel Euclid systems',
34 'linux-fsl-imx51': 'Linux kernel for IMX51',
35 'linux-linaro': 'Linux kernel for ARM',
36 'linux-lts-backport-maverick': 'Linux kernel backport from Maverick',
37@@ -751,6 +753,7 @@
38 meta_kernels.add_new_kernel('xenial', ['linux-gcp'], ['linux-meta-gcp'], '-4.8.0') # suffix may need to change, but it looks like it is ignored
39 meta_kernels.add_new_kernel('xenial', ['linux-gke'], ['linux-meta-gke'], '-4.4.0')
40 meta_kernels.add_new_kernel('xenial', ['linux-kvm'], ['linux-meta-kvm'], '-4.4.0')
41+meta_kernels.add_new_kernel('xenial', ['linux-euclid'], ['linux-meta-euclid'], '-4.4.0')
42 meta_kernels.add_new_kernel('xenial', ['linux-joule'], ['linux-meta-joule'], '-4.4.0')
43 meta_kernels.add_new_kernel('xenial', ['linux-snapdragon'], ['linux-meta-snapdragon'], '-4.4.0')
44 meta_kernels.add_new_kernel('xenial', ['linux-hwe'], ['linux-meta-hwe'], '-4.8.0')
45
46=== modified file 'scripts/prepare-kernel-usn.py'
47--- scripts/prepare-kernel-usn.py 2017-08-16 19:16:15 +0000
48+++ scripts/prepare-kernel-usn.py 2017-08-30 05:17:10 +0000
49@@ -38,7 +38,7 @@
50 uct_script_dir = os.path.join(os.environ['UCT'], 'scripts')
51
52 # adjust this line when adding new kernels
53-generate_usn_regex = r'^linux-image-(\d|generic|virtual|lowlatency|power|omap|raspi2|snapdragon|highbank|aws|gcp|gke|azure|joule|kvm)'
54+generate_usn_regex = r'^linux-image-(\d|generic|virtual|lowlatency|power|omap|raspi2|snapdragon|highbank|aws|gcp|gke|azure|joule|kvm|euclid)'
55
56 def grouper(iterable, n, fillvalue=None):
57 "Collect data into fixed-length chunks or blocks"
58
59=== modified file 'scripts/sis-generate-usn'
60--- scripts/sis-generate-usn 2017-08-16 16:42:55 +0000
61+++ scripts/sis-generate-usn 2017-08-30 05:17:10 +0000
62@@ -505,6 +505,7 @@
63 'linux-fsl-imx51': 'Linux kernel (FSL-IMX51)',
64 'linux-ti-omap4': 'Linux kernel (OMAP4)',
65 'linux-raspi2': 'Linux kernel (Raspberry Pi 2)',
66+ 'linux-euclid': 'Linux kernel (Intel Euclid)',
67 'linux-joule': 'Linux kernel (Intel Joule)',
68 'linux-snapdragon': 'Linux kernel (Qualcomm Snapdragon)',
69 'linux-mvl-dove': 'Linux kernel (Marvell DOVE)',