summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-11-16 11:01:50 +0100
committerPatrick Vacek <patrickvacek@gmail.com>2018-11-16 11:12:02 +0100
commite0f2275894daeb268180648ceb5488f45757d592 (patch)
tree3b417d9ce50cad84dfd1bdcafb46924ace57d9de
parent8c72fd4555dc5637316564895ec3271b40389497 (diff)
downloadmeta-updater-e0f2275894daeb268180648ceb5488f45757d592.tar.gz
aktualizr: Bump to latest and fix names.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--lib/oeqa/selftest/cases/updater.py12
-rw-r--r--recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb6
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb6
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index e4b2fa5..eb43994 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -103,7 +103,7 @@ class AktualizrToolsTests(OESelftestTestCase):
103 bitbake('aktualizr-native') 103 bitbake('aktualizr-native')
104 104
105 def test_cert_provider_help(self): 105 def test_cert_provider_help(self):
106 akt_native_run(self, 'aktualizr_cert_provider --help') 106 akt_native_run(self, 'aktualizr-cert-provider --help')
107 107
108 def test_cert_provider_local_output(self): 108 def test_cert_provider_local_output(self):
109 logger = logging.getLogger("selftest") 109 logger = logging.getLogger("selftest")
@@ -115,7 +115,7 @@ class AktualizrToolsTests(OESelftestTestCase):
115 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') 115 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov')
116 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' 116 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml'
117 117
118 akt_native_run(self, 'aktualizr_cert_provider -c {creds} -r -l {temp} -g {config}' 118 akt_native_run(self, 'aktualizr-cert-provider -c {creds} -r -l {temp} -g {config}'
119 .format(creds=creds, temp=temp_dir, config=config)) 119 .format(creds=creds, temp=temp_dir, config=config))
120 120
121 # Might be nice if these names weren't hardcoded. 121 # Might be nice if these names weren't hardcoded.
@@ -424,14 +424,14 @@ class ImplProvTests(OESelftestTestCase):
424 self.assertIn(b'Fetched metadata: no', stdout, 424 self.assertIn(b'Fetched metadata: no', stdout,
425 'Device already provisioned!? ' + stderr.decode() + stdout.decode()) 425 'Device already provisioned!? ' + stderr.decode() + stdout.decode())
426 426
427 # Run cert_provider. 427 # Run aktualizr-cert-provider.
428 bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') 428 bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native')
429 creds = bb_vars['SOTA_PACKED_CREDENTIALS'] 429 creds = bb_vars['SOTA_PACKED_CREDENTIALS']
430 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') 430 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov')
431 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' 431 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml'
432 432
433 print('Provisining at root@localhost:%d' % self.qemu.ssh_port) 433 print('Provisining at root@localhost:%d' % self.qemu.ssh_port)
434 akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}' 434 akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}'
435 .format(creds=creds, port=self.qemu.ssh_port, config=config)) 435 .format(creds=creds, port=self.qemu.ssh_port, config=config))
436 436
437 verifyProvisioned(self, machine) 437 verifyProvisioned(self, machine)
@@ -509,13 +509,13 @@ class HsmTests(OESelftestTestCase):
509 self.assertNotEqual(retcode, 0, 'softhsm2-tool succeeded before initialization: ' + 509 self.assertNotEqual(retcode, 0, 'softhsm2-tool succeeded before initialization: ' +
510 stdout.decode() + stderr.decode()) 510 stdout.decode() + stderr.decode())
511 511
512 # Run cert_provider. 512 # Run aktualizr-cert-provider.
513 bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') 513 bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native')
514 creds = bb_vars['SOTA_PACKED_CREDENTIALS'] 514 creds = bb_vars['SOTA_PACKED_CREDENTIALS']
515 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov') 515 bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov')
516 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml' 516 config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml'
517 517
518 akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}' 518 akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}'
519 .format(creds=creds, port=self.qemu.ssh_port, config=config)) 519 .format(creds=creds, port=self.qemu.ssh_port, config=config))
520 520
521 # Verify that HSM is able to initialize. 521 # Verify that HSM is able to initialize.
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
index a729e6b..41af7c0 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
+++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
@@ -37,9 +37,9 @@ do_install() {
37 fi 37 fi
38 38
39 install -m 0700 -d ${D}${localstatedir}/sota 39 install -m 0700 -d ${D}${localstatedir}/sota
40 aktualizr_cert_provider --credentials ${SOTA_PACKED_CREDENTIALS} \ 40 aktualizr-cert-provider --credentials ${SOTA_PACKED_CREDENTIALS} \
41 --device-ca ${SOTA_CACERT_PATH} \ 41 --fleet-ca ${SOTA_CACERT_PATH} \
42 --device-ca-key ${SOTA_CAKEY_PATH} \ 42 --fleet-ca-key ${SOTA_CAKEY_PATH} \
43 --root-ca \ 43 --root-ca \
44 --server-url \ 44 --server-url \
45 --local ${D} \ 45 --local ${D} \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 14de9fa..0d946f3 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -27,7 +27,7 @@ SRC_URI = " \
27 file://aktualizr-serialcan.service \ 27 file://aktualizr-serialcan.service \
28 " 28 "
29 29
30SRCREV = "4621a15779db38531fb386478232a9e8593e53f4" 30SRCREV = "348822d914f422a8d7b34a1e98cfdd1fa3cf816c"
31BRANCH ?= "master" 31BRANCH ?= "master"
32 32
33S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"
@@ -106,12 +106,12 @@ FILES_${PN} = " \
106 " 106 "
107 107
108FILES_${PN}-examples = " \ 108FILES_${PN}-examples = " \
109 ${bindir}/hmi_stub \ 109 ${bindir}/hmi-stub \
110 " 110 "
111 111
112FILES_${PN}-host-tools = " \ 112FILES_${PN}-host-tools = " \
113 ${bindir}/aktualizr-repo \ 113 ${bindir}/aktualizr-repo \
114 ${bindir}/aktualizr_cert_provider \ 114 ${bindir}/aktualizr-cert-provider \
115 ${bindir}/garage-deploy \ 115 ${bindir}/garage-deploy \
116 ${bindir}/garage-push \ 116 ${bindir}/garage-push \
117 ${libdir}/sota/sota_autoprov.toml \ 117 ${libdir}/sota/sota_autoprov.toml \