From 0bf9b42b751a438e6a256611c235baa1ecb6843b Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 25 Jul 2018 17:23:59 +0200 Subject: Document SOTA_CLIENT_FEATURES = "secondary-network". --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 75ee9ae..d2bd4b5 100644 --- a/README.adoc +++ b/README.adoc @@ -81,7 +81,7 @@ Although we have used U-Boot so far, other boot loaders can be configured work w * `OSTREE_INITRAMFS_IMAGE` - initramfs/initrd image that is used as a proxy while booting into OSTree deployment. Do not change this setting unless you are sure that your initramfs can serve as such a proxy. * `SOTA_PACKED_CREDENTIALS` - when set, your ostree commit will be pushed to a remote repo as a bitbake step. This should be the path to a zipped credentials file in https://github.com/advancedtelematic/aktualizr/blob/master/docs/credentials.adoc[the format accepted by garage-push]. * `SOTA_CLIENT_PROV` - which provisioning method to use. Valid options are https://github.com/advancedtelematic/aktualizr/blob/master/docs/automatic-provisioning.adoc[`aktualizr-auto-prov`], https://github.com/advancedtelematic/aktualizr/blob/master/docs/implicit-provisioning.adoc[`aktualizr-implicit-prov`], and https://github.com/advancedtelematic/aktualizr/blob/master/docs/hsm-provisioning.adoc[`aktualizr-hsm-prov`]. The default is `aktualizr-auto-prov`. This can also be set to an empty string to avoid using a provisioning recipe. -* `SOTA_CLIENT_FEATURES` - extensions to aktualizr. The only valid option is `hsm` (to build with HSM support) +* `SOTA_CLIENT_FEATURES` - extensions to aktualizr. The only valid options are `hsm` (to build with HSM support) and `secondary-network` (to set up a simulated 'in-vehicle' network with support for a primary node with a DHCP server and a secondary node with a DHCP client). * `SOTA_SECONDARY_ECUS` - a list of paths separated by spaces of JSON configuration files for virtual secondaries on the host. These will be installed into `/var/sota/ecus` on the device. * `SOTA_VIRTUAL_SECONDARIES` - a list of paths separated by spaces of JSON configuration files for virtual secondaries installed on the device. If `SOTA_SECONDARY_ECUS` is used to install them, then you can expect them to be installed in `/var/sota/ecus`. -- cgit v1.2.3-54-g00ecf From a2bb8a02a982e6fdbcd272af984da90807399be9 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 26 Jul 2018 16:46:24 +0200 Subject: aktualizr: bump to latest and accommodate hmi_stub. --- recipes-sota/aktualizr/aktualizr_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 6096c7b..c7aac59 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -28,7 +28,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "e9faff35ffa8c31cbf3c5fb1c3c6ed4f5f50e500" +SRCREV = "68bd9e681fff63615f491f59ec48e0f67bf097c2" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -103,6 +103,7 @@ FILES_${PN}-examples = " \ ${libdir}/sota/demo_secondary.json \ ${bindir}/example-interface \ ${bindir}/isotp-test-interface \ + ${bindir}/hmi_stub \ " FILES_${PN}-host-tools = " \ -- cgit v1.2.3-54-g00ecf From 5953082eaf61ad6f49633b8c5137c7dc793fea01 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Wed, 1 Aug 2018 16:51:58 +0200 Subject: Bump Aktualizr revision to fix HSM bug --- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index c7aac59..0465ffd 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -28,7 +28,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "68bd9e681fff63615f491f59ec48e0f67bf097c2" +SRCREV = "9207f7534a03a09cbc1e8b9c414070210380cab1" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 3dd8643030c7d973e08f536f9dde5b6029cf8321 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 8 Aug 2018 16:13:08 +0200 Subject: aktualizr: bump to latest for key rotation and storage updates. Work around a bug in oe-selftest with migration and aktualizr-info interplay by forcing --allow-migrate for now. --- lib/oeqa/selftest/cases/updater.py | 2 +- 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): Disable the systemd service then run aktualizr manually """ sleep(20) - stdout, stderr, retcode = self.qemu_command('aktualizr-info') + stdout, stderr, retcode = self.qemu_command('aktualizr-info --allow-migrate') self.assertIn(b'Fetched metadata: no', stdout, 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode()) 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 = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "9207f7534a03a09cbc1e8b9c414070210380cab1" +SRCREV = "a94a15e31f3b973966b1afc9081fc1b17a3b9d48" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf