Merge lp:~newell-jensen/maas-images/mustang-for-utopic-and-vivid into lp:maas-images

[Newell Jensen]

This branch updates conf/meph-v2.yaml so that it will now build Utopic and Vivid images for Mustang.

This adds Mustang for Utopic and Vivid.

[lp:~newell-jensen/maas-images/mustang-for-utopic-and-vivid]

204. By Newell Jensen on 2015-03-20

Fix typos.

[Newell Jensen (newell-jensen)]

Fixed typos. See new diff.

On Fri, Mar 20, 2015 at 2:31 PM, Newell Jensen <email address hidden>
wrote:

> Newell Jensen has proposed merging
> lp:~newell-jensen/maas-images/mustang-for-utopic-and-vivid into
> lp:maas-images.
>
> Commit message:
> This branch updates conf/meph-v2.yaml so that it will now build Utopic and
> Vivid images for Mustang.
>
> Requested reviews:
> maintainers of maas images (maas-images-maintainers)
>
> For more details, see:
>
> https://code.launchpad.net/~newell-jensen/maas-images/mustang-for-utopic-and-vivid/+merge/253743
>
> This adds Mustang for Utopic and Vivid.
> --
> You are the owner of
> lp:~newell-jensen/maas-images/mustang-for-utopic-and-vivid.
>
> === modified file 'conf/meph-v2.yaml'
> --- conf/meph-v2.yaml 2015-03-11 20:23:13 +0000
> +++ conf/meph-v2.yaml 2015-03-20 21:30:50 +0000
> @@ -37,6 +37,9 @@
> - [vivid, arm64, hwe-v, generic, linux-generic,
> *sa_hwe_v]
> - [vivid, arm64, *xguboot, generic, linux-generic,
> [*xguboot],
> {suffix: .xgene, kihelper: kh-xgene, di-format: 'xgene'}]
> + - [trusty, arm64, *mustang, generic, linux-generic,
> [*mustang],
> + {suffix: .xgene-mustang, kihelper: kh-xgene, di-format: 'xgene',
> + dtb: 'apm-mustang.dtb'}]
> - version: 14.10
> release: utopic
> kernels:
> @@ -48,6 +51,9 @@
> - [utopic, arm64, hwe-u, generic, linux-generic,
> *sa_hwe_u]
> - [utopic, arm64, *xguboot, generic, linux-generic,
> [*xguboot],
> {suffix: .xgene, kihelper: kh-xgene, di-format: 'xgene'}]
> + - [trusty, arm64, *mustang, generic, linux-generic,
> [*mustang],
> + {suffix: .xgene-mustang, kihelper: kh-xgene, di-format: 'xgene',
> + dtb: 'apm-mustang.dtb'}]
> - version: 14.04
> release: trusty
> kernels:
>
>
>

=== modified file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml	2015-03-11 20:23:13 +0000
+++ conf/meph-v2.yaml	2015-03-20 21:33:16 +0000
@@ -37,6 +37,9 @@
     - [vivid,   arm64,   hwe-v,    generic,   linux-generic,            *sa_hwe_v]
     - [vivid,   arm64,   *xguboot, generic,   linux-generic,            [*xguboot],
        {suffix: .xgene, kihelper: kh-xgene, di-format: 'xgene'}]
+    - [vivid,  arm64,   *mustang, generic,   linux-generic,            [*mustang],
+       {suffix: .xgene-mustang, kihelper: kh-xgene, di-format: 'xgene',
+        dtb: 'apm-mustang.dtb'}]
  - version: 14.10
    release: utopic
    kernels:
@@ -48,6 +51,9 @@
     - [utopic,  arm64,   hwe-u,    generic,   linux-generic,            *sa_hwe_u]
     - [utopic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot],
        {suffix: .xgene, kihelper: kh-xgene, di-format: 'xgene'}]
+    - [utopic,  arm64,   *mustang, generic,   linux-generic,            [*mustang],
+       {suffix: .xgene-mustang, kihelper: kh-xgene, di-format: 'xgene',
+        dtb: 'apm-mustang.dtb'}]
  - version: 14.04
    release: trusty
    kernels: