maas-images

Merge ~andreserl/maas-images:dont_use_signed into maas-images:master

  1. Git
  2. lp:~andreserl/maas-images
  3. dont_use_signed
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Merge reported by: Lee Trager
Merged at revision: 2a8228b75259ebcc1acb8fa9e5b9d780971fac89
Proposed branch: ~andreserl/maas-images:dont_use_signed
Merge into: maas-images:master
Diff against target: 76 lines (+13/-13)
2 files modified
conf/meph-v2.yaml (+3/-3)
conf/meph-v3.yaml (+10/-10)
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+364703@code.launchpad.net

Commit message

Don't use -signed for bionic+ as it is now a metapackage

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/conf/meph-v2.yaml b/conf/meph-v2.yaml
2index 9ddd347..6a7ee35 100644
3--- a/conf/meph-v2.yaml
4+++ b/conf/meph-v2.yaml
5@@ -51,7 +51,7 @@ releases:
6 - version: "19.04"
7 release: disco
8 kernels:
9- - [disco, amd64, hwe-d, generic, linux-signed-generic, *sa_hwe_d]
10+ - [disco, amd64, hwe-d, generic, linux-generic, *sa_hwe_d]
11 - [disco, arm64, hwe-d, generic, linux-generic, *sa_hwe_d]
12 - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
13 - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
14@@ -63,7 +63,7 @@ releases:
15 - version: "18.10"
16 release: cosmic
17 kernels:
18- - [cosmic, amd64, hwe-c, generic, linux-signed-generic, *sa_hwe_c]
19+ - [cosmic, amd64, hwe-c, generic, linux-generic, *sa_hwe_c]
20 - [cosmic, arm64, hwe-c, generic, linux-generic, *sa_hwe_c]
21 - [cosmic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
22 - [cosmic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
23@@ -75,7 +75,7 @@ releases:
24 - version: "18.04"
25 release: bionic
26 kernels:
27- - [bionic, amd64, hwe-b, generic, linux-signed-generic, *sa_hwe_b]
28+ - [bionic, amd64, hwe-b, generic, linux-generic, *sa_hwe_b]
29 - [bionic, arm64, hwe-b, generic, linux-generic, *sa_hwe_b]
30 - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
31 - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
32diff --git a/conf/meph-v3.yaml b/conf/meph-v3.yaml
33index a52c2b8..56b3ca6 100644
34--- a/conf/meph-v3.yaml
35+++ b/conf/meph-v3.yaml
36@@ -60,8 +60,8 @@ releases:
37 - version: "19.04"
38 release: disco
39 kernels:
40- - [disco, amd64, ga-19.04, generic, linux-signed-generic, *sa_hwe_dd]
41- - [disco, amd64, ga-19.04, lowlatency, linux-signed-image-lowlatency, *sa_hwe_dd]
42+ - [disco, amd64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
43+ - [disco, amd64, ga-19.04, lowlatency, linux-image-lowlatency, *sa_hwe_dd]
44 - [disco, arm64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
45 - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
46 - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
47@@ -74,8 +74,8 @@ releases:
48 - version: "18.10"
49 release: cosmic
50 kernels:
51- - [cosmic, amd64, ga-18.10, generic, linux-signed-generic, *sa_hwe_cc]
52- - [cosmic, amd64, ga-18.10, lowlatency, linux-signed-image-lowlatency, *sa_hwe_cc]
53+ - [cosmic, amd64, ga-18.10, generic, linux-generic, *sa_hwe_cc]
54+ - [cosmic, amd64, ga-18.10, lowlatency, linux-image-lowlatency, *sa_hwe_cc]
55 - [cosmic, arm64, ga-18.10, generic, linux-generic, *sa_hwe_cc]
56 - [cosmic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
57 - [cosmic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
58@@ -88,12 +88,12 @@ releases:
59 - version: "18.04"
60 release: bionic
61 kernels:
62- - [bionic, amd64, ga-18.04, generic, linux-signed-generic, *sa_hwe_b]
63- - [bionic, amd64, ga-18.04, lowlatency, linux-signed-lowlatency, *sa_hwe_b]
64- - [bionic, amd64, hwe-18.04, generic, linux-signed-generic-hwe-18.04, *sa_hwe_b]
65- - [bionic, amd64, hwe-18.04, lowlatency, linux-signed-lowlatency-hwe-18.04, *sa_hwe_b]
66- - [bionic, amd64, hwe-18.04-edge, generic, linux-signed-generic-hwe-18.04-edge, *sa_hwe_b_edge]
67- - [bionic, amd64, hwe-18.04-edge, lowlatency, linux-signed-lowlatency-hwe-18.04-edge, *sa_hwe_b_edge]
68+ - [bionic, amd64, ga-18.04, generic, linux-generic, *sa_hwe_b]
69+ - [bionic, amd64, ga-18.04, lowlatency, linux-lowlatency, *sa_hwe_b]
70+ - [bionic, amd64, hwe-18.04, generic, linux-generic-hwe-18.04, *sa_hwe_b]
71+ - [bionic, amd64, hwe-18.04, lowlatency, linux-lowlatency-hwe-18.04, *sa_hwe_b]
72+ - [bionic, amd64, hwe-18.04-edge, generic, linux-generic-hwe-18.04-edge, *sa_hwe_b_edge]
73+ - [bionic, amd64, hwe-18.04-edge, lowlatency, linux-lowlatency-hwe-18.04-edge, *sa_hwe_b_edge]
74 - [bionic, arm64, ga-18.04, generic, linux-generic, *sa_hwe_b]
75 - [bionic, arm64, hwe-18.04, generic, linux-generic-hwe-18.04, *sa_hwe_b]
76 - [bionic, arm64, hwe-18.04-edge, generic, linux-generic-hwe-18.04-edge, *sa_hwe_b_edge]

Subscribers

People subscribed via source and target branches