From fcf3daa7d63bf9a9948bafb2cc0472dc7d08d401 Mon Sep 17 00:00:00 2001 From: Mike Sul Date: Tue, 18 Jun 2019 10:11:18 +0300 Subject: OTA-2294: Use WiFi on Primary (if enabled) to communicate with the backend in case of RPi target Signed-off-by: Mike Sul --- conf/include/bblayers/sota_raspberrypi3.inc | 1 + recipes-test/demo-network-config/network-config.inc | 2 -- recipes-test/demo-network-config/primary-network-config.bb | 3 ++- recipes-test/demo-network-config/secondary-network-config.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc index ea420ba..7e320af 100644 --- a/conf/include/bblayers/sota_raspberrypi3.inc +++ b/conf/include/bblayers/sota_raspberrypi3.inc @@ -1,2 +1,3 @@ BBLAYERS += "${METADIR}/meta-updater-raspberrypi" BBLAYERS += "${METADIR}/meta-raspberrypi" +BBLAYERS += "${METADIR}/meta-openembedded/meta-networking" diff --git a/recipes-test/demo-network-config/network-config.inc b/recipes-test/demo-network-config/network-config.inc index c713589..ed623d4 100644 --- a/recipes-test/demo-network-config/network-config.inc +++ b/recipes-test/demo-network-config/network-config.inc @@ -1,5 +1,3 @@ -CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('IMAGE_TYPE') == 'primary' else 'static'}" - SRC_URI_append = "\ file://26-${CONF_TYPE}-client.network \ " diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb index 1c17e0a..d840a95 100644 --- a/recipes-test/demo-network-config/primary-network-config.bb +++ b/recipes-test/demo-network-config/primary-network-config.bb @@ -18,8 +18,9 @@ do_install() { } PRIMARY_IP ?= "10.0.3.1" + IP_ADDR = "${PRIMARY_IP}" -IMAGE_TYPE = "primary" +CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}" require network-config.inc diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb index 1c7f01c..b1d70f1 100644 --- a/recipes-test/demo-network-config/secondary-network-config.bb +++ b/recipes-test/demo-network-config/secondary-network-config.bb @@ -23,7 +23,7 @@ do_install() { SECONDARY_IP ?= "10.0.3.2" IP_ADDR = "${SECONDARY_IP}" -IMAGE_TYPE = "secondary" +CONF_TYPE = "static" require network-config.inc -- cgit v1.2.3-54-g00ecf