From c787e1f856b9cab97119b8672acbd5c4847cf4a1 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 4 Mar 2020 15:10:44 +0100 Subject: aktualizr: remove unnecessary rm. libuptiny (the "partial" subdirectory) and its dependencies were removed from the aktualizr repo a while ago. Signed-off-by: Patrick Vacek --- recipes-sota/aktualizr/aktualizr_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 804f2c2..24aec3e 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -86,9 +86,6 @@ do_install_ptest() { cp -r ${B}/ ${D}/${PTEST_PATH}/build cp -r ${S}/ ${D}/${PTEST_PATH}/src - # remove huge external unused repository - rm -rf ${D}/${PTEST_PATH}/src/partial/extern/RIOT - # remove huge build artifacts find ${D}/${PTEST_PATH}/build/src -name "*.a" -delete -- cgit v1.2.3-54-g00ecf From 32aae74c37c246ac4e4b933391dce2dad993714c Mon Sep 17 00:00:00 2001 From: Minori Yasumura Date: Tue, 11 Feb 2020 16:32:19 +0900 Subject: Rename defconfig and bootfiles The file name of sota has been changed in AGL, so change it to apply. Signed-off-by: Minori Yasumura --- classes/sota_m3ulcb.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index b93cc40..e7fa9c2 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass @@ -1,11 +1,12 @@ # Commit united image to OSTree, not just uImage OSTREE_KERNEL = "Image" -EXTRA_IMAGEDEPENDS_append_sota = " m3ulcb-ota-bootfiles" -IMAGE_BOOT_FILES_sota += "m3ulcb-ota-bootfiles/*" +EXTRA_IMAGEDEPENDS_append_sota = " renesas-ota-bootfiles" +IMAGE_BOOT_FILES_sota += "renesas-ota-bootfiles/*" OSTREE_BOOTLOADER ?= "u-boot" -UBOOT_MACHINE_sota = "m3ulcb_defconfig" + +UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" IMAGE_INSTALL_append_sota = " virtual/network-configuration " -- cgit v1.2.3-54-g00ecf From 69dba3a758e4b7e1301939aeaa651b8292fb90e5 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 5 Mar 2020 14:24:37 +0100 Subject: Fix aktualizr-ptest shlib yocto errors Signed-off-by: Laurent Bonnans --- recipes-sota/aktualizr/aktualizr_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 24aec3e..30256b1 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -12,6 +12,8 @@ RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-cert-provider ${@bb.utils.conta RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" +PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" + PV = "1.0+git${SRCPV}" PR = "7" -- cgit v1.2.3-54-g00ecf From 34d781c0e00dcd960c795810f01328db7529f6b3 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 5 Mar 2020 16:00:41 +0100 Subject: Properly track SOTA_SECONDARY_CONFIG dependency Signed-off-by: Laurent Bonnans --- recipes-test/demo-config/primary-config.bb | 1 + 1 file changed, 1 insertion(+) 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}" SRC_URI = "\ file://30-secondary-config.toml \ file://ip_secondary_config.json \ + ${@('file://' + d.getVar('SOTA_SECONDARY_CONFIG')) if d.getVar('SOTA_SECONDARY_CONFIG') else ''} \ " def get_secondary_addrs(d): -- cgit v1.2.3-54-g00ecf From 18a0c871d15f8f18acb54f7955ff23eabac9c46e Mon Sep 17 00:00:00 2001 From: Mykhaylo Sul Date: Thu, 12 Mar 2020 22:23:42 +0100 Subject: fix: run aktualizr service after network is online Signed-off-by: Mykhaylo Sul --- recipes-sota/aktualizr/files/aktualizr-secondary.service | 3 ++- recipes-sota/aktualizr/files/aktualizr.service | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/recipes-sota/aktualizr/files/aktualizr-secondary.service index b577ae8..fb610f9 100644 --- a/recipes-sota/aktualizr/files/aktualizr-secondary.service +++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service @@ -1,6 +1,7 @@ [Unit] Description=Aktualizr SOTA Client (UPTANE Secondary) -After=network.target +After=network-online.target +Wants=network-online.target [Service] RestartSec=10 diff --git a/recipes-sota/aktualizr/files/aktualizr.service b/recipes-sota/aktualizr/files/aktualizr.service index b6f0980..3d807a1 100644 --- a/recipes-sota/aktualizr/files/aktualizr.service +++ b/recipes-sota/aktualizr/files/aktualizr.service @@ -1,6 +1,7 @@ [Unit] Description=Aktualizr SOTA Client -After=network.target nss-lookup.target +After=network-online.target nss-lookup.target +Wants=network-online.target [Service] RestartSec=10 -- cgit v1.2.3-54-g00ecf From 661e7cb0aad564d1e4168fe27fcd470ea0d79c18 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 30256b1..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 = "9f2cc5d7b026eb1a1404f0c77ef6cb9377245423" +SRCREV = "f90e8996e826d130976a7b7f1835947b7e631025" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From b1cdef48bee12264e4defa6a268e37e31823846d 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