Merge lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch into lp:~maas-committers/maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 3499
Proposed branch: lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 13 lines (+3/-0)
1 file modified
src/provisioningserver/drivers/__init__.py (+3/-0)
To merge this branch: bzr merge lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+246023@code.launchpad.net

Commit message

This branch adds the new xgene-uboot-mustang sub-architecture.

Description of the change

This branch doesn't have an isolated test for the change as the current tests already exercise the sub-architectures.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) :
review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

What about the DTD file? If de enable mustang dont de need to send a DTD
file over simple streams?
On Jan 9, 2015 6:35 PM, "Newell Jensen" <email address hidden> wrote:

> Newell Jensen has proposed merging
> lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch into lp:maas.
>
> Commit message:
> This branch adds the new xgene-uboot-mustang sub-architecture.
>
> Requested reviews:
> MAAS Maintainers (maas-maintainers)
> Related bugs:
> Bug #1387610 in MAAS: "Create a new sub-arch for APM's Mustang X-Gene
> Board"
> https://bugs.launchpad.net/maas/+bug/1387610
>
> For more details, see:
>
> https://code.launchpad.net/~newell-jensen/maas/add-xgene-uboot-mustang-subarch/+merge/246023
>
> This branch doesn't have an isolated test for the change as the current
> tests already exercise the sub-architectures.
> --
> You are subscribed to branch lp:maas.
>
> === modified file 'src/provisioningserver/drivers/__init__.py'
> --- src/provisioningserver/drivers/__init__.py 2014-08-13 21:49:35 +0000
> +++ src/provisioningserver/drivers/__init__.py 2015-01-09 23:33:43 +0000
> @@ -246,6 +246,9 @@
> name="arm64/xgene-uboot", description="arm64/xgene-uboot",
> pxealiases=["arm"]),
> Architecture(
> + name="arm64/xgene-uboot-mustang",
> + description="arm64/xgene-uboot-mustang", pxealiases=["arm"]),
> + Architecture(
> name="armhf/highbank", description="armhf/highbank",
> pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
> Architecture(
>
>
>

Revision history for this message
Andres Rodriguez (andreserl) wrote :

And pxe?
On Jan 12, 2015 11:38 AM, "Andres Rodriguez" <email address hidden>
wrote:

> What about the DTD file? If de enable mustang dont de need to send a DTD
> file over simple streams?
> On Jan 9, 2015 6:35 PM, "Newell Jensen" <email address hidden>
> wrote:
>
>> Newell Jensen has proposed merging
>> lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch into lp:maas.
>>
>> Commit message:
>> This branch adds the new xgene-uboot-mustang sub-architecture.
>>
>> Requested reviews:
>> MAAS Maintainers (maas-maintainers)
>> Related bugs:
>> Bug #1387610 in MAAS: "Create a new sub-arch for APM's Mustang X-Gene
>> Board"
>> https://bugs.launchpad.net/maas/+bug/1387610
>>
>> For more details, see:
>>
>> https://code.launchpad.net/~newell-jensen/maas/add-xgene-uboot-mustang-subarch/+merge/246023
>>
>> This branch doesn't have an isolated test for the change as the current
>> tests already exercise the sub-architectures.
>> --
>> You are subscribed to branch lp:maas.
>>
>> === modified file 'src/provisioningserver/drivers/__init__.py'
>> --- src/provisioningserver/drivers/__init__.py 2014-08-13 21:49:35 +0000
>> +++ src/provisioningserver/drivers/__init__.py 2015-01-09 23:33:43 +0000
>> @@ -246,6 +246,9 @@
>> name="arm64/xgene-uboot", description="arm64/xgene-uboot",
>> pxealiases=["arm"]),
>> Architecture(
>> + name="arm64/xgene-uboot-mustang",
>> + description="arm64/xgene-uboot-mustang", pxealiases=["arm"]),
>> + Architecture(
>> name="armhf/highbank", description="armhf/highbank",
>> pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
>> Architecture(
>>
>>
>>

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Andres,

That would be in a different branch. Nothing about this branch has to do
with DTB files. This is just for adding a new sub-architecture.

On Mon, Jan 12, 2015 at 8:39 AM, Andres Rodriguez <email address hidden>
wrote:

> What about the DTD file? If de enable mustang dont de need to send a DTD
> file over simple streams?
> On Jan 9, 2015 6:35 PM, "Newell Jensen" <email address hidden>
> wrote:
>
> > Newell Jensen has proposed merging
> > lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch into lp:maas.
> >
> > Commit message:
> > This branch adds the new xgene-uboot-mustang sub-architecture.
> >
> > Requested reviews:
> > MAAS Maintainers (maas-maintainers)
> > Related bugs:
> > Bug #1387610 in MAAS: "Create a new sub-arch for APM's Mustang X-Gene
> > Board"
> > https://bugs.launchpad.net/maas/+bug/1387610
> >
> > For more details, see:
> >
> >
> https://code.launchpad.net/~newell-jensen/maas/add-xgene-uboot-mustang-subarch/+merge/246023
> >
> > This branch doesn't have an isolated test for the change as the current
> > tests already exercise the sub-architectures.
> > --
> > You are subscribed to branch lp:maas.
> >
> > === modified file 'src/provisioningserver/drivers/__init__.py'
> > --- src/provisioningserver/drivers/__init__.py 2014-08-13 21:49:35 +0000
> > +++ src/provisioningserver/drivers/__init__.py 2015-01-09 23:33:43 +0000
> > @@ -246,6 +246,9 @@
> > name="arm64/xgene-uboot", description="arm64/xgene-uboot",
> > pxealiases=["arm"]),
> > Architecture(
> > + name="arm64/xgene-uboot-mustang",
> > + description="arm64/xgene-uboot-mustang", pxealiases=["arm"]),
> > + Architecture(
> > name="armhf/highbank", description="armhf/highbank",
> > pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
> > Architecture(
> >
> >
> >
>
> --
>
> https://code.launchpad.net/~newell-jensen/maas/add-xgene-uboot-mustang-subarch/+merge/246023
> You are the owner of
> lp:~newell-jensen/maas/add-xgene-uboot-mustang-subarch.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/drivers/__init__.py'
2--- src/provisioningserver/drivers/__init__.py 2014-08-13 21:49:35 +0000
3+++ src/provisioningserver/drivers/__init__.py 2015-01-09 23:33:43 +0000
4@@ -246,6 +246,9 @@
5 name="arm64/xgene-uboot", description="arm64/xgene-uboot",
6 pxealiases=["arm"]),
7 Architecture(
8+ name="arm64/xgene-uboot-mustang",
9+ description="arm64/xgene-uboot-mustang", pxealiases=["arm"]),
10+ Architecture(
11 name="armhf/highbank", description="armhf/highbank",
12 pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
13 Architecture(