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

[Scott Moser]

enable bionic

[Scott Moser (smoser)]

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

[Dan Watkins (oddbloke)]

LGTM.

review: Approve

=== 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 @@
  - &sa_hwe_y  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
  - &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]
  - &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]
+ - &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]
  - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
  - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
  - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -32,6 +33,7 @@
  - &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]
  - &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]
  - &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]
+ - &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]
 
 misc:
  - &glpae generic-lpae
@@ -42,6 +44,18 @@
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
 releases:
+ - version: "18.04"
+   release: bionic
+   kernels:
+    - [bionic,  amd64,   hwe-b,    generic,   linux-generic,            *sa_hwe_b]
+    - [bionic,  arm64,   hwe-b,    generic,   linux-generic,            *sa_hwe_b]
+    - [bionic,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
+    - [bionic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
+    - [bionic,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
+    - [bionic,  armhf,   hwe-b,    generic,   linux-generic,            *arm_hwe_b]
+    - [bionic,  i386,    hwe-b,    generic,   linux-generic,            *sa_hwe_b]
+    - [bionic,  ppc64el, hwe-b,    generic,   linux-generic,            *sa_hwe_b]
+    - [bionic,  s390x,   hwe-b,    generic,   linux-generic,            *sa_hwe_b]
  - version: "17.10"
    release: artful
    kernels:

=== 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 @@
  - &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]
  - &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]
  - &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]
+ - &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]
  - &arm_hwe_t       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
  - &arm_hwe_u       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
  - &arm_hwe_v       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -39,6 +40,7 @@
  - &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]
  - &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]
  - &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]
+ - &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]
 
 misc:
  - &glpae generic-lpae
@@ -49,6 +51,20 @@
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
 releases:
+ - version: "18.04"
+   release: bionic
+   kernels:
+    - [bionic,     amd64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
+    - [bionic,     amd64,    ga-18.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_b]
+    - [bionic,     arm64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
+    - [bionic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
+    - [bionic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
+    - [bionic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
+    - [bionic,     armhf,    ga-18.04,        generic,     linux-generic,                        *arm_hwe_b]
+    - [bionic,     i386,     ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
+    - [bionic,     i386,     ga-18.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_b]
+    - [bionic,     ppc64el,  ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
+    - [bionic,     s390x,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
  - version: "17.10"
    release: artful
    kernels:

=== 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 @@
 
 
 streams_package=true
-if [[ "$rel" < trusty ]]; then
-    error "# WARN: building not supported prior to trusty" 1>&2
-    error "# WARN:  but meph2-util (index operations) supported" 1>&2
-    [ "${MEPH2_SIMPLESTREAMS}" = "package" ] &&
-        fail "no distro simplestreams < trusty"
-    MEPH2_SIMPLESTREAMS="auto"
-    streams_package=false
-    def_meph2_only=true
-else
-    def_meph2_only=false
-fi
+def_meph2_only=false
 
 case "$MEPH2_UTIL_ONLY" in
     false|0) meph2_only=false;;