From 3ab647b8b9996d70fe494eedc0c95a1acb34965c Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 24 Mar 2020 14:59:42 +0100 Subject: aktualizr: Bump to 2020.4 and latest garage-sign. Signed-off-by: Patrick Vacek --- recipes-sota/aktualizr/aktualizr_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 80cf3eb..a0c2713 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -17,7 +17,7 @@ PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" PV = "1.0+git${SRCPV}" PR = "7" -GARAGE_SIGN_PV = "0.7.0-70-g3adf982" +GARAGE_SIGN_PV = "0.7.0-87-g905dc3c" SRC_URI = " \ gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ @@ -29,10 +29,10 @@ SRC_URI = " \ ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ " -SRC_URI[garagesign.md5sum] = "7c4cbeacefd97eae69104d29cf5ff37a" -SRC_URI[garagesign.sha256sum] = "e9a9b68eaa1ce4104eb2ab7f1f59d99742d50805e93216fb5b21d1f212aa3d82" +SRC_URI[garagesign.md5sum] = "064b408c60676dcf282aa9209bff7dac" +SRC_URI[garagesign.sha256sum] = "75c9b3cf24eb31dacb127d3b3d073359082e2b4ee4eeb27d75e792664800ba82" -SRCREV = "ba10c86befef02ee24f9bad5251265d7f0dc4376" +SRCREV = "f90e8996e826d130976a7b7f1835947b7e631025" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 68820877358c54a232ef959a30af5ad8af1f3294 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 25 Mar 2020 11:53:19 +0100 Subject: Fix oe-selftest log message case Was changed recently Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/testutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py index 3455fa8..3abfa5e 100644 --- a/lib/oeqa/selftest/cases/testutils.py +++ b/lib/oeqa/selftest/cases/testutils.py @@ -139,10 +139,10 @@ def verifyProvisioned(testInst, machine, hwid=''): testInst.assertEqual(stderr, b'', 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) if hwid == '': - testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, + testInst.assertIn(b'Primary ECU hardware ID: ' + machine.encode(), stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) else: - testInst.assertIn(b'Primary ecu hardware ID: ' + hwid.encode(), stdout, + testInst.assertIn(b'Primary ECU hardware ID: ' + hwid.encode(), stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) testInst.assertIn(b'Fetched metadata: yes', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) p = re.compile(r'Device ID: ([a-z0-9-]*)\n') -- cgit v1.2.3-54-g00ecf