Merge ~cypressyew/ubuntu-cve-tracker:oem-5.13 into ubuntu-cve-tracker:master

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: d8b8f7586896b0b62a0a9a2520a2ca39c7ceab90
Proposed branch: ~cypressyew/ubuntu-cve-tracker:oem-5.13
Merge into: ubuntu-cve-tracker:master
Diff against target: 72 lines (+21/-0)
4 files modified
active/00boilerplate.linux (+10/-0)
meta_lists/package_info_overrides.json (+4/-0)
scripts/cve_lib.py (+1/-0)
scripts/kernel_lib.py (+6/-0)
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+408071@code.launchpad.net

Commit message

Add tracking for focal/linux-oem-5.13 kernel based on the commit that adds F-oem-5.10 (14f96c290581)

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Patch already applied.

Revision history for this message
Steve Beattie (sbeattie) wrote :

Ah sorry, I missed the merge request notification, but saw it through Cascardo's branch, and accepted it that way. Thanks for adding this kernel for tracking.

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

Thanks, I will go for some other kernels later.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/active/00boilerplate.linux b/active/00boilerplate.linux
2index 8887373..a1d4c54 100644
3--- a/active/00boilerplate.linux
4+++ b/active/00boilerplate.linux
5@@ -456,6 +456,16 @@ focal_linux-oem-5.10: needs-triage
6 hirsute_linux-oem-5.10: DNE
7 devel_linux-oem-5.10: DNE
8
9+Patches_linux-oem-5.13:
10+upstream_linux-oem-5.13: needs-triage
11+trusty_linux-oem-5.13: DNE
12+trusty/esm_linux-oem-5.13: DNE
13+xenial_linux-oem-5.13: DNE
14+bionic_linux-oem-5.13: DNE
15+focal_linux-oem-5.13: needs-triage
16+hirsute_linux-oem-5.13: DNE
17+devel_linux-oem-5.13: DNE
18+
19 Patches_linux-oem-osp1:
20 upstream_linux-oem-osp1: needs-triage
21 trusty_linux-oem-osp1: DNE
22diff --git a/meta_lists/package_info_overrides.json b/meta_lists/package_info_overrides.json
23index 15e348f..8ec9c9f 100644
24--- a/meta_lists/package_info_overrides.json
25+++ b/meta_lists/package_info_overrides.json
26@@ -1295,6 +1295,10 @@
27 "description": "Linux kernel for OEM systems",
28 "title": "Linux kernel (OEM)"
29 },
30+ "linux-oem-5.13": {
31+ "description": "Linux kernel for OEM systems",
32+ "title": "Linux kernel (OEM)"
33+ },
34 "linux-oem-5.6": {
35 "description": "Linux kernel for OEM systems",
36 "title": "Linux kernel (OEM)"
37diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
38index 801c970..e216846 100755
39--- a/scripts/cve_lib.py
40+++ b/scripts/cve_lib.py
41@@ -224,6 +224,7 @@ kernel_srcs = set(['linux',
42 'linux-oem-5.4',
43 'linux-oem-5.6',
44 'linux-oem-5.10',
45+ 'linux-oem-5.13',
46 'linux-oem-osp1',
47 'linux-oracle',
48 'linux-oracle-5.0',
49diff --git a/scripts/kernel_lib.py b/scripts/kernel_lib.py
50index b6b342a..6a350fd 100755
51--- a/scripts/kernel_lib.py
52+++ b/scripts/kernel_lib.py
53@@ -194,6 +194,7 @@ meta_kernels.add_new_kernel('focal', ['linux-raspi'], '-5.4.0', signed=False)
54 meta_kernels.add_new_kernel('focal', ['linux-raspi2'], '-5.4.0', signed=False)
55 meta_kernels.add_new_kernel('focal', ['linux-oem-5.6'], '-5.6.0')
56 meta_kernels.add_new_kernel('focal', ['linux-oem-5.10'], '-5.10.0')
57+meta_kernels.add_new_kernel('focal', ['linux-oem-5.13'], '-5.13.0')
58 meta_kernels.add_new_kernel('focal', ['linux-aws'], '-5.4.0', signed=False)
59 meta_kernels.add_new_kernel('focal', ['linux-aws-5.8'], '-5.8.0', signed=False)
60 meta_kernels.add_new_kernel('focal', ['linux-azure'], '-5.4.0') # suffix may need to change, but it looks like it is ignored
61@@ -537,6 +538,11 @@ kernel_glitches = {
62 '5.10.0-1038.40': '5.10.0-1044.46',
63 },
64 },
65+ 'linux-oem-5.13': {
66+ 'focal': {
67+ '~': '5.13.0-1011.15', # initial publication
68+ },
69+ },
70 'linux-oracle': {
71 'xenial': {
72 '~': '4.15.0-1008.10~16.04.1',

Subscribers

People subscribed via source and target branches