diff options
author | lbonn <lbonn@users.noreply.github.com> | 2020-03-10 14:49:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 14:49:55 +0100 |
commit | 6d673cb87c44255bacf002e687b4b205246d9402 (patch) | |
tree | 682b2c0250fcbb7ee056758d72d9f8b497836aed | |
parent | 32b5e19b768530f21a0f17db73fb49562d024618 (diff) | |
parent | aea95cd658e1ed3d45c4be40fe83bd927a475497 (diff) | |
download | meta-updater-6d673cb87c44255bacf002e687b4b205246d9402.tar.gz |
Merge pull request #696 from advancedtelematic/feat/OTA-4524/secondary-auto-reboot
Secondary auto-reboot support
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 2 | ||||
-rw-r--r-- | recipes-test/demo-config/primary-config.bb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 30256b1..80cf3eb 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -32,7 +32,7 @@ SRC_URI = " \ | |||
32 | SRC_URI[garagesign.md5sum] = "7c4cbeacefd97eae69104d29cf5ff37a" | 32 | SRC_URI[garagesign.md5sum] = "7c4cbeacefd97eae69104d29cf5ff37a" |
33 | SRC_URI[garagesign.sha256sum] = "e9a9b68eaa1ce4104eb2ab7f1f59d99742d50805e93216fb5b21d1f212aa3d82" | 33 | SRC_URI[garagesign.sha256sum] = "e9a9b68eaa1ce4104eb2ab7f1f59d99742d50805e93216fb5b21d1f212aa3d82" |
34 | 34 | ||
35 | SRCREV = "9f2cc5d7b026eb1a1404f0c77ef6cb9377245423" | 35 | SRCREV = "ba10c86befef02ee24f9bad5251265d7f0dc4376" |
36 | BRANCH ?= "master" | 36 | BRANCH ?= "master" |
37 | 37 | ||
38 | S = "${WORKDIR}/git" | 38 | S = "${WORKDIR}/git" |
diff --git a/recipes-test/demo-config/primary-config.bb b/recipes-test/demo-config/primary-config.bb index b1964e2..5c8abb5 100644 --- a/recipes-test/demo-config/primary-config.bb +++ b/recipes-test/demo-config/primary-config.bb | |||
@@ -11,6 +11,7 @@ PRIMARY_SECONDARIES ?= "${SECONDARY_IP}:${SECONDARY_PORT}" | |||
11 | SRC_URI = "\ | 11 | SRC_URI = "\ |
12 | file://30-secondary-config.toml \ | 12 | file://30-secondary-config.toml \ |
13 | file://ip_secondary_config.json \ | 13 | file://ip_secondary_config.json \ |
14 | ${@('file://' + d.getVar('SOTA_SECONDARY_CONFIG')) if d.getVar('SOTA_SECONDARY_CONFIG') else ''} \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | def get_secondary_addrs(d): | 17 | def get_secondary_addrs(d): |