diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-04-27 09:35:01 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-03 10:55:36 +0200 |
commit | 1f3231cbc3257eaebbf100df10b2ac2e70dd6671 (patch) | |
tree | 1df9310c9f0378492e7b795aba630684d96f2fdf /recipes-sota/aktualizr | |
parent | c04e7bded7915e6bc9c70128d4a8be0cf7dec7cd (diff) | |
download | meta-updater-1f3231cbc3257eaebbf100df10b2ac2e70dd6671.tar.gz |
Move example-interface from sota.env to its own recipe.
SOTA_LEGACY_SECONDARY_INTERFACE is now obsolete. Instead, include this:
IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "
Diffstat (limited to 'recipes-sota/aktualizr')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/environment.inc | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 07e5bb8..6b17114 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
@@ -16,8 +16,6 @@ SRC_URI = " \ | |||
16 | require environment.inc | 16 | require environment.inc |
17 | require credentials.inc | 17 | require credentials.inc |
18 | 18 | ||
19 | export SOTA_PACKED_CREDENTIALS | ||
20 | |||
21 | do_install() { | 19 | do_install() { |
22 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then | 20 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then |
23 | bbwarn "SOTA_AUTOPROVISION_CREDENTIALS are ignored. Please use SOTA_PACKED_CREDENTIALS" | 21 | bbwarn "SOTA_AUTOPROVISION_CREDENTIALS are ignored. Please use SOTA_PACKED_CREDENTIALS" |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index cd2844c..4c18355 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = " \ | |||
22 | file://aktualizr-secondary.socket \ | 22 | file://aktualizr-secondary.socket \ |
23 | file://aktualizr-serialcan.service \ | 23 | file://aktualizr-serialcan.service \ |
24 | " | 24 | " |
25 | SRCREV = "9a813ab0857a2448ac2c2dbc5300e47164db7f01" | 25 | SRCREV = "cbb586efcd5f14a5c6a2c7cf71d75f575bf3d13f" |
26 | BRANCH ?= "master" | 26 | BRANCH ?= "master" |
27 | 27 | ||
28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
diff --git a/recipes-sota/aktualizr/environment.inc b/recipes-sota/aktualizr/environment.inc index 09da6b7..94806bd 100644 --- a/recipes-sota/aktualizr/environment.inc +++ b/recipes-sota/aktualizr/environment.inc | |||
@@ -1,17 +1,12 @@ | |||
1 | export SOTA_LEGACY_SECONDARY_INTERFACE | ||
2 | export SOTA_VIRTUAL_SECONDARIES | 1 | export SOTA_VIRTUAL_SECONDARIES |
3 | 2 | ||
4 | do_install_append() { | 3 | do_install_append() { |
5 | if [ -n "${SOTA_LEGACY_SECONDARY_INTERFACE}" ]; then | ||
6 | AKTUALIZR_PARAMETERS_LEGACYSEC="--legacy-interface ${SOTA_LEGACY_SECONDARY_INTERFACE}" | ||
7 | fi | ||
8 | |||
9 | AKTUALIZR_PARAMETERS_CONFIGFILE="--config /usr/lib/sota/sota.toml" | 4 | AKTUALIZR_PARAMETERS_CONFIGFILE="--config /usr/lib/sota/sota.toml" |
10 | for sec in ${SOTA_VIRTUAL_SECONDARIES}; do | 5 | for sec in ${SOTA_VIRTUAL_SECONDARIES}; do |
11 | AKTUALIZR_PARAMETERS_VIRTUALSECS="${AKTUALIZR_PARAMETERS_VIRTUALSECS} --secondary-config $sec" | 6 | AKTUALIZR_PARAMETERS_VIRTUALSECS="${AKTUALIZR_PARAMETERS_VIRTUALSECS} --secondary-config $sec" |
12 | done | 7 | done |
13 | 8 | ||
14 | echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_CONFIGFILE} ${AKTUALIZR_PARAMETERS_LEGACYSEC} ${AKTUALIZR_PARAMETERS_VIRTUALSECS}" > ${D}${libdir}/sota/sota.env | 9 | echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_CONFIGFILE} ${AKTUALIZR_PARAMETERS_VIRTUALSECS}" > ${D}${libdir}/sota/sota.env |
15 | } | 10 | } |
16 | 11 | ||
17 | FILES_${PN}_append = " ${libdir}/sota/sota.env" | 12 | FILES_${PN}_append = " ${libdir}/sota/sota.env" |