diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-08 12:16:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-08 12:16:06 +0200 |
commit | 1097975b7ef84f5c9ae90a0e46821b61e3b5f8c8 (patch) | |
tree | 02ebc4f7bd1d180baf7f76b72f475c193c7d454c | |
parent | 8c71253e0f045fc9664e0a16596ddc100c9492c3 (diff) | |
parent | a8c4f54b7adbe0169b2ee62a9c8f8911ca9b0bf6 (diff) | |
download | meta-updater-1097975b7ef84f5c9ae90a0e46821b61e3b5f8c8.tar.gz |
Merge pull request #307 from advancedtelematic/bugfix/bump-aktualizr
Bugfix/bump aktualizr
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 4 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 6dcc8df..2efef15 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -671,12 +671,12 @@ def akt_native_run(testInst, cmd, **kwargs): | |||
671 | def verifyProvisioned(testInst, machine): | 671 | def verifyProvisioned(testInst, machine): |
672 | # Verify that device HAS provisioned. | 672 | # Verify that device HAS provisioned. |
673 | ran_ok = False | 673 | ran_ok = False |
674 | for delay in [5, 5, 5, 5, 10]: | 674 | for delay in [5, 5, 5, 5, 10, 10, 10, 10]: |
675 | sleep(delay) | ||
676 | stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') | 675 | stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') |
677 | if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: | 676 | if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: |
678 | ran_ok = True | 677 | ran_ok = True |
679 | break | 678 | break |
679 | sleep(delay) | ||
680 | testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 680 | testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
681 | testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, | 681 | testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, |
682 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 682 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index f455013..083f5cc 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 = "5fa9a79f1fb29266c862a9a6cb32082bb77844a5" | 25 | SRCREV = "617d6d9242239a5719296f18e207ac4d8d94b7b2" |
26 | BRANCH ?= "master" | 26 | BRANCH ?= "master" |
27 | 27 | ||
28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
@@ -41,7 +41,8 @@ require garage-sign-version.inc | |||
41 | 41 | ||
42 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \ | 42 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \ |
43 | -DCMAKE_BUILD_TYPE=Release \ | 43 | -DCMAKE_BUILD_TYPE=Release \ |
44 | -DAKTUALIZR_VERSION=${PV} " | 44 | -DAKTUALIZR_VERSION=${PV} \ |
45 | -DBUILD_LOAD_TESTS=OFF" | ||
45 | EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ | 46 | EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ |
46 | -DBUILD_ISOTP=ON \ | 47 | -DBUILD_ISOTP=ON \ |
47 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " | 48 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " |