maas-images

Merge lp:~smoser/maas-images/trunk.bionic into lp:maas-images

  1. trunk.bionic
  2. Merge into maas-ephemerals
Proposed by Scott Moser
Status: Merged
Merged at revision: 384
Proposed branch: lp:~smoser/maas-images/trunk.bionic
Merge into: lp:maas-images
Diff against target: 102 lines (+31/-11)
3 files modified
conf/meph-v2.yaml (+14/-0)
conf/meph-v3.yaml (+16/-0)
system-setup (+1/-11)
To merge this branch: bzr merge lp:~smoser/maas-images/trunk.bionic
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
maintainers of maas images Pending
Review via email: mp+334144@code.launchpad.net

Description of the change

enable bionic

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

For reference, this is basically like revno 363
 http://bazaar.launchpad.net/~maas-images-maintainers/maas-images/maas-ephemerals/revision/363

Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml 2017-05-03 10:29:59 +0000
+++ conf/meph-v2.yaml 2017-11-22 20:19:00 +0000
@@ -24,6 +24,7 @@
24 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]24 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
25 - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]25 - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
26 - &sa_hwe_a [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]26 - &sa_hwe_a [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
27 - &sa_hwe_b [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
27 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]28 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
28 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]29 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
29 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]30 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -32,6 +33,7 @@
32 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]33 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
33 - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]34 - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
34 - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]35 - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
36 - &arm_hwe_b [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
3537
36misc:38misc:
37 - &glpae generic-lpae39 - &glpae generic-lpae
@@ -42,6 +44,18 @@
42 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}44 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
4345
44releases:46releases:
47 - version: "18.04"
48 release: bionic
49 kernels:
50 - [bionic, amd64, hwe-b, generic, linux-generic, *sa_hwe_b]
51 - [bionic, arm64, hwe-b, generic, linux-generic, *sa_hwe_b]
52 - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
53 - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
54 - [bionic, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
55 - [bionic, armhf, hwe-b, generic, linux-generic, *arm_hwe_b]
56 - [bionic, i386, hwe-b, generic, linux-generic, *sa_hwe_b]
57 - [bionic, ppc64el, hwe-b, generic, linux-generic, *sa_hwe_b]
58 - [bionic, s390x, hwe-b, generic, linux-generic, *sa_hwe_b]
45 - version: "17.10"59 - version: "17.10"
46 release: artful60 release: artful
47 kernels:61 kernels:
4862
=== modified file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml 2017-05-03 10:29:59 +0000
+++ conf/meph-v3.yaml 2017-11-22 20:19:00 +0000
@@ -30,6 +30,7 @@
30 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]30 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
31 - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]31 - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]
32 - &sa_hwe_a [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]32 - &sa_hwe_a [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]
33 - &sa_hwe_b [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04]
33 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]34 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
34 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]35 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
35 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]36 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -39,6 +40,7 @@
39 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]40 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
40 - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]41 - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]
41 - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]42 - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]
43 - &arm_hwe_b [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04]
4244
43misc:45misc:
44 - &glpae generic-lpae46 - &glpae generic-lpae
@@ -49,6 +51,20 @@
49 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}51 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
5052
51releases:53releases:
54 - version: "18.04"
55 release: bionic
56 kernels:
57 - [bionic, amd64, ga-18.04, generic, linux-generic, *sa_hwe_b]
58 - [bionic, amd64, ga-18.04, lowlatency, linux-image-lowlatency, *sa_hwe_b]
59 - [bionic, arm64, ga-18.04, generic, linux-generic, *sa_hwe_b]
60 - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
61 - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
62 - [bionic, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
63 - [bionic, armhf, ga-18.04, generic, linux-generic, *arm_hwe_b]
64 - [bionic, i386, ga-18.04, generic, linux-generic, *sa_hwe_b]
65 - [bionic, i386, ga-18.04, lowlatency, linux-image-lowlatency, *sa_hwe_b]
66 - [bionic, ppc64el, ga-18.04, generic, linux-generic, *sa_hwe_b]
67 - [bionic, s390x, ga-18.04, generic, linux-generic, *sa_hwe_b]
52 - version: "17.10"68 - version: "17.10"
53 release: artful69 release: artful
54 kernels:70 kernels:
5571
=== modified file 'system-setup'
--- system-setup 2016-08-01 19:14:10 +0000
+++ system-setup 2017-11-22 20:19:00 +0000
@@ -76,17 +76,7 @@
7676
7777
78streams_package=true78streams_package=true
79if [[ "$rel" < trusty ]]; then79def_meph2_only=false
80 error "# WARN: building not supported prior to trusty" 1>&2
81 error "# WARN: but meph2-util (index operations) supported" 1>&2
82 [ "${MEPH2_SIMPLESTREAMS}" = "package" ] &&
83 fail "no distro simplestreams < trusty"
84 MEPH2_SIMPLESTREAMS="auto"
85 streams_package=false
86 def_meph2_only=true
87else
88 def_meph2_only=false
89fi
9080
91case "$MEPH2_UTIL_ONLY" in81case "$MEPH2_UTIL_ONLY" in
92 false|0) meph2_only=false;;82 false|0) meph2_only=false;;

Subscribers

People subscribed via source and target branches