From 3eb27429feceaac13027874b2d90af7680b1e1fb Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 11 Jun 2020 08:47:35 +0100 Subject: [PATCH] arm-autonomy, xenguest-network-bridge: Set bridge members per machine 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 Reviewed-by: Bertrand Marquis Signed-off-by: Jon Mason --- .../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 dc849210..de88cced 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 babd694d..c6c2242f 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 = " \