diff options
author | Mike Sul <ext-mykhaylo.sul@here.com> | 2019-06-18 10:11:18 +0300 |
---|---|---|
committer | Mykhaylo Sul <ext-mykhaylo.sul@here.com> | 2019-07-19 20:44:15 +0200 |
commit | 1e4297fb44fd2c7a34d25c947e6951a6fb64f359 (patch) | |
tree | f8fe431ab4acad88d4378cdc6c2153764ec48828 | |
parent | 2d9556df6492273eca7d35d115d24f9d69ba2ca7 (diff) | |
download | meta-updater-1e4297fb44fd2c7a34d25c947e6951a6fb64f359.tar.gz |
OTA-2294: Use WiFi on Primary (if enabled) to communicate with the backend in case of RPi target
Signed-off-by: Mike Sul <ext-mykhaylo.sul@here.com>
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc index 03f8f44..42d5eb1 100644 --- a/conf/include/bblayers/sota_raspberrypi3.inc +++ b/conf/include/bblayers/sota_raspberrypi3.inc | |||
@@ -1,3 +1,4 @@ | |||
1 | BBLAYERS += "${METADIR}/meta-openembedded/meta-python" | 1 | BBLAYERS += "${METADIR}/meta-openembedded/meta-python" |
2 | BBLAYERS += "${METADIR}/meta-updater-raspberrypi" | 2 | BBLAYERS += "${METADIR}/meta-updater-raspberrypi" |
3 | BBLAYERS += "${METADIR}/meta-raspberrypi" | 3 | BBLAYERS += "${METADIR}/meta-raspberrypi" |
4 | 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 @@ | |||
1 | CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('IMAGE_TYPE') == 'primary' else 'static'}" | ||
2 | |||
3 | SRC_URI_append = "\ | 1 | SRC_URI_append = "\ |
4 | file://26-${CONF_TYPE}-client.network \ | 2 | file://26-${CONF_TYPE}-client.network \ |
5 | " | 3 | " |
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() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | PRIMARY_IP ?= "10.0.3.1" | 20 | PRIMARY_IP ?= "10.0.3.1" |
21 | |||
21 | IP_ADDR = "${PRIMARY_IP}" | 22 | IP_ADDR = "${PRIMARY_IP}" |
22 | IMAGE_TYPE = "primary" | 23 | CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}" |
23 | 24 | ||
24 | require network-config.inc | 25 | require network-config.inc |
25 | 26 | ||
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() { | |||
23 | 23 | ||
24 | SECONDARY_IP ?= "10.0.3.2" | 24 | SECONDARY_IP ?= "10.0.3.2" |
25 | IP_ADDR = "${SECONDARY_IP}" | 25 | IP_ADDR = "${SECONDARY_IP}" |
26 | IMAGE_TYPE = "secondary" | 26 | CONF_TYPE = "static" |
27 | 27 | ||
28 | require network-config.inc | 28 | require network-config.inc |
29 | 29 | ||