diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-08-08 16:13:08 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-08-08 16:13:08 +0200 |
commit | 3dd8643030c7d973e08f536f9dde5b6029cf8321 (patch) | |
tree | 506427dcf253e29486fea496a3391e035c878540 | |
parent | 5953082eaf61ad6f49633b8c5137c7dc793fea01 (diff) | |
download | meta-updater-3dd8643030c7d973e08f536f9dde5b6029cf8321.tar.gz |
aktualizr: bump to latest for key rotation and storage updates.feat/PRO-Tech-#1-rocko
Work around a bug in oe-selftest with migration and aktualizr-info
interplay by forcing --allow-migrate for now.
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 2 | ||||
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index ed4d8d7..8686033 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -226,7 +226,7 @@ class ManualControlTests(OESelftestTestCase): | |||
226 | Disable the systemd service then run aktualizr manually | 226 | Disable the systemd service then run aktualizr manually |
227 | """ | 227 | """ |
228 | sleep(20) | 228 | sleep(20) |
229 | stdout, stderr, retcode = self.qemu_command('aktualizr-info') | 229 | stdout, stderr, retcode = self.qemu_command('aktualizr-info --allow-migrate') |
230 | self.assertIn(b'Fetched metadata: no', stdout, | 230 | self.assertIn(b'Fetched metadata: no', stdout, |
231 | 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode()) | 231 | 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode()) |
232 | 232 | ||
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 0465ffd..19f76b0 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -28,7 +28,7 @@ SRC_URI = " \ | |||
28 | file://aktualizr-secondary.socket \ | 28 | file://aktualizr-secondary.socket \ |
29 | file://aktualizr-serialcan.service \ | 29 | file://aktualizr-serialcan.service \ |
30 | " | 30 | " |
31 | SRCREV = "9207f7534a03a09cbc1e8b9c414070210380cab1" | 31 | SRCREV = "a94a15e31f3b973966b1afc9081fc1b17a3b9d48" |
32 | BRANCH ?= "master" | 32 | BRANCH ?= "master" |
33 | 33 | ||
34 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |