[meta-arm] arm-autonomy, xenguest-network-bridge: Set bridge members per machine

Submitted by Diego Sueiro on June 11, 2020, 7:47 a.m. | Patch ID: 173465

Details

Message ID 1591861655-35452-1-git-send-email-diego.sueiro@arm.com
State New
Headers show

Commit Message

Diego Sueiro June 11, 2020, 7:47 a.m.
By default, XENGUEST_NETWORK_BRIDGE_MEMBERS should be empty and only be
set per machine.

Change-Id: I67c56847eb785279c28757a6052f092c838babe0
Issue-Id: SCM-995
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 .../recipes-extended/xenguest/xenguest-network-bridge.bbappend    | 8 ++++++++
 .../recipes-extended/xenguest/xenguest-network-bridge.bb          | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
index dc84921..de88cce 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
@@ -1,2 +1,10 @@ 
+XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
+
+XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
+
+XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
+
+XENGUEST_NETWORK_BRIDGE_MEMBERS_gem5-arm64 ?= "eth0"
+
 # Juno board has 2 network interfaces, add both of them to the bridge
 XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
index babd694..c6c2242 100644
--- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
+++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
@@ -9,7 +9,11 @@  S = "${WORKDIR}"
 # Please refer to documentation/xenguest-network-bridge.md for documentation on
 # those parameters
 XENGUEST_NETWORK_BRIDGE_NAME ?= "xenbr0"
-XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
+
+# The XENGUEST_NETWORK_BRIDGE_MEMBERS should be set in a machine.conf
+# or bbappend file.
+#XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
+
 XENGUEST_NETWORK_BRIDGE_CONFIG ?= "xenguest-network-bridge-dhcp.cfg.in"
 
 SRC_URI = " \

Comments

Bertrand Marquis June 11, 2020, 7:55 a.m.
> On 11 Jun 2020, at 08:47, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> 
> By default, XENGUEST_NETWORK_BRIDGE_MEMBERS should be empty and only be
> set per machine.
> 
> Change-Id: I67c56847eb785279c28757a6052f092c838babe0
> Issue-Id: SCM-995
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> .../recipes-extended/xenguest/xenguest-network-bridge.bbappend    | 8 ++++++++
> .../recipes-extended/xenguest/xenguest-network-bridge.bb          | 6 +++++-
> 2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> index dc84921..de88cce 100644
> --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> @@ -1,2 +1,10 @@
> +XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
> +
> +XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
> +
> +XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
> +
> +XENGUEST_NETWORK_BRIDGE_MEMBERS_gem5-arm64 ?= "eth0"
> +
> # Juno board has 2 network interfaces, add both of them to the bridge
> XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
> diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> index babd694..c6c2242 100644
> --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> @@ -9,7 +9,11 @@ S = "${WORKDIR}"
> # Please refer to documentation/xenguest-network-bridge.md for documentation on
> # those parameters
> XENGUEST_NETWORK_BRIDGE_NAME ?= "xenbr0"
> -XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
> +
> +# The XENGUEST_NETWORK_BRIDGE_MEMBERS should be set in a machine.conf
> +# or bbappend file.
> +#XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
> +
> XENGUEST_NETWORK_BRIDGE_CONFIG ?= "xenguest-network-bridge-dhcp.cfg.in"
> 
> SRC_URI = " \
> -- 
> 2.7.4
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#602): https://lists.yoctoproject.org/g/meta-arm/message/602
Mute This Topic: https://lists.yoctoproject.org/mt/74814095/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 11, 2020, 2:02 p.m.
On Thu, Jun 11, 2020 at 07:55:05AM +0000, Bertrand Marquis wrote:
> 
> 
> > On 11 Jun 2020, at 08:47, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> > 
> > By default, XENGUEST_NETWORK_BRIDGE_MEMBERS should be empty and only be
> > set per machine.
> > 
> > Change-Id: I67c56847eb785279c28757a6052f092c838babe0
> > Issue-Id: SCM-995
> > Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Applied to the master branch.

Thanks,
Jon

> 
> > ---
> > .../recipes-extended/xenguest/xenguest-network-bridge.bbappend    | 8 ++++++++
> > .../recipes-extended/xenguest/xenguest-network-bridge.bb          | 6 +++++-
> > 2 files changed, 13 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> > index dc84921..de88cce 100644
> > --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> > +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network-bridge.bbappend
> > @@ -1,2 +1,10 @@
> > +XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
> > +
> > +XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
> > +
> > +XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
> > +
> > +XENGUEST_NETWORK_BRIDGE_MEMBERS_gem5-arm64 ?= "eth0"
> > +
> > # Juno board has 2 network interfaces, add both of them to the bridge
> > XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
> > diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> > index babd694..c6c2242 100644
> > --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> > +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network-bridge.bb
> > @@ -9,7 +9,11 @@ S = "${WORKDIR}"
> > # Please refer to documentation/xenguest-network-bridge.md for documentation on
> > # those parameters
> > XENGUEST_NETWORK_BRIDGE_NAME ?= "xenbr0"
> > -XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
> > +
> > +# The XENGUEST_NETWORK_BRIDGE_MEMBERS should be set in a machine.conf
> > +# or bbappend file.
> > +#XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
> > +
> > XENGUEST_NETWORK_BRIDGE_CONFIG ?= "xenguest-network-bridge-dhcp.cfg.in"
> > 
> > SRC_URI = " \
> > -- 
> > 2.7.4
> > 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#611): https://lists.yoctoproject.org/g/meta-arm/message/611
Mute This Topic: https://lists.yoctoproject.org/mt/74814095/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Diego Sueiro June 11, 2020, 2:19 p.m.
On Thu, Jun 11, 2020 at 03:02 PM, Jon Mason wrote:

>
> On Thu, Jun 11, 2020 at 07:55:05AM +0000, Bertrand Marquis wrote:
> > 
> > 
> > > On 11 Jun 2020, at 08:47, Diego Sueiro via lists.yoctoproject.org
> <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> > > 
> > > By default, XENGUEST_NETWORK_BRIDGE_MEMBERS should be empty and only be
> > > set per machine.
> > > 
> > > Change-Id: I67c56847eb785279c28757a6052f092c838babe0
> > > Issue-Id: SCM-995
> > > Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> > Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> 
> Applied to the master branch.

Can you please apply to dunfell as well?
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#617): https://lists.yoctoproject.org/g/meta-arm/message/617
Mute This Topic: https://lists.yoctoproject.org/mt/74814095/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 11, 2020, 4:28 p.m.
On Thu, Jun 11, 2020 at 07:19:57AM -0700, Diego Sueiro wrote:
> On Thu, Jun 11, 2020 at 03:02 PM, Jon Mason wrote:
> 
> >
> > On Thu, Jun 11, 2020 at 07:55:05AM +0000, Bertrand Marquis wrote:
> > > 
> > > 
> > > > On 11 Jun 2020, at 08:47, Diego Sueiro via lists.yoctoproject.org
> > <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> > > > 
> > > > By default, XENGUEST_NETWORK_BRIDGE_MEMBERS should be empty and only be
> > > > set per machine.
> > > > 
> > > > Change-Id: I67c56847eb785279c28757a6052f092c838babe0
> > > > Issue-Id: SCM-995
> > > > Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> > > Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> > 
> > Applied to the master branch.
> 
> Can you please apply to dunfell as well?

Done

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#623): https://lists.yoctoproject.org/g/meta-arm/message/623
Mute This Topic: https://lists.yoctoproject.org/mt/74814095/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-