init-ifupdown: Fix BSPs that were setting partial overrides

Issue: CR-1061420

The init-ifupdown will choose alternative network interface configuration
files based on the FILESOVERRIDE setting, which usually includes a
machine name.  If an alternative is selected, then the package should
become machine specific.

The BSPs were setting the files override, but were NOT settings the
required machine override.  Fix this by setting the necessary
machine override, ensuring the init-ifupdown IS now machine specific.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

3 files changed, 3 insertions, 0 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
index 5f9d604b..3e5d623f 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
@@ -16,6 +16,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 
 # Use the networking setup from qemuarm
+MACHINEOVERRIDES_prepend_pn-init-ifupdown = "qemuall:"
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
 # This machine is a targeting a QEMU model, runqemu setup:
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 3700e57b..8bccfde2 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -15,6 +15,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 HDF_MACHINE = "zc702-zynq7"
 
 # Use the networking setup from qemuarm
+MACHINEOVERRIDES_prepend_pn-init-ifupdown = "qemuall:"
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
 QB_MEM = "-m 1024"
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index f7e372c4..75336e98 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -19,6 +19,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 HDF_MACHINE = "zc702-zynq7"
 
 # Use the networking setup from qemuarm
+MACHINEOVERRIDES_prepend_pn-init-ifupdown = "qemuall:"
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
 QB_MEM = "-m 1024"