From 85095e8dc9beda9a3c6e070bc303276ac02a7281 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 30 Nov 2017 10:41:38 +0100 Subject: Use *.toml files provided in aktualizr github repo This enables backwards incompatible changes to configuration format --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 5 ++--- recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | 3 +-- recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 3 +-- recipes-sota/aktualizr/aktualizr_git.bb | 7 ++++++- recipes-sota/aktualizr/files/sota_autoprov.toml | 14 -------------- recipes-sota/aktualizr/files/sota_hsm_test.toml | 18 ------------------ recipes-sota/aktualizr/files/sota_implicit_prov.toml | 11 ----------- 7 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 recipes-sota/aktualizr/files/sota_autoprov.toml delete mode 100644 recipes-sota/aktualizr/files/sota_hsm_test.toml delete mode 100644 recipes-sota/aktualizr/files/sota_implicit_prov.toml diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 4436d48..e44530a 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" SECTION = "base" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" -DEPENDS = "zip-native" +DEPENDS = "aktualizr-native zip-native" RDEPENDS_${PN} = "aktualizr" PV = "1.0" PR = "6" @@ -12,7 +12,6 @@ PR = "6" SRC_URI = " \ file://LICENSE \ file://aktualizr.service \ - file://sota_autoprov.toml \ " SYSTEMD_SERVICE_${PN} = "aktualizr.service" @@ -39,7 +38,7 @@ do_install_append() { install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota - install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}${libdir}/sota/sota.toml + install -m "0644" ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_autoprov.toml ${D}${libdir}/sota/sota.toml # deploy SOTA credentials if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb index 33e472b..cc34528 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb @@ -11,7 +11,6 @@ RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken" SRC_URI = " \ file://LICENSE \ file://aktualizr.service \ - file://sota_hsm_test.toml \ " PV = "1.0" PR = "6" @@ -25,7 +24,7 @@ do_install() { install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ - -i ${WORKDIR}/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D} } FILES_${PN} = " \ diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index a1db87f..5688b95 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -12,7 +12,6 @@ PR = "1" SRC_URI = " \ file://LICENSE \ file://aktualizr.service \ - file://sota_implicit_prov.toml \ " SYSTEMD_SERVICE_${PN} = "aktualizr.service" @@ -24,7 +23,7 @@ do_install() { install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ - -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} } FILES_${PN} = " \ diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index d6beecb..e713571 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -18,7 +18,7 @@ PR = "7" SRC_URI = " \ git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ " -SRCREV = "860553a1c98513bf43f6ce98491bf65addcf7e48" +SRCREV = "1fb258b13547e229043113380e4a69d404756524" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -40,6 +40,10 @@ do_install_append_class-target () { do_install_append_class-native () { rm -f ${D}${bindir}/aktualizr rm -f ${D}${bindir}/aktualizr-info + install -d ${D}${libdir}/sota + install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml + install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml + install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml } FILES_${PN}_class-target = " \ @@ -50,4 +54,5 @@ FILES_${PN}_class-native = " \ ${bindir}/aktualizr_implicit_writer \ ${bindir}/garage-deploy \ ${bindir}/garage-push \ + ${libdir}/sota/* \ " diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml deleted file mode 100644 index 9fbb093..0000000 --- a/recipes-sota/aktualizr/files/sota_autoprov.toml +++ /dev/null @@ -1,14 +0,0 @@ -[tls] -certificates_directory = "/var/sota/" -ca_file = "root.crt" -client_certificate = "client.pem" -pkey_file = "pkey.pem" - -[uptane] -metadata_path = "/var/sota/metadata" -private_key_path = "ecukey.der" -public_key_path = "ecukey.pub" - -[provision] -provision_path = "/var/sota/sota_provisioning_credentials.zip" - diff --git a/recipes-sota/aktualizr/files/sota_hsm_test.toml b/recipes-sota/aktualizr/files/sota_hsm_test.toml deleted file mode 100644 index 28aefc2..0000000 --- a/recipes-sota/aktualizr/files/sota_hsm_test.toml +++ /dev/null @@ -1,18 +0,0 @@ -[tls] -certificates_directory = "/var/sota/" -ca_file = "/var/sota/token/root.crt" -client_certificate = "01" -cert_source = "pkcs11" -pkey_file = "02" -pkey_source = "pkcs11" - -[p11] -module = "/usr/lib/softhsm/libsofthsm2.so" -pass = "1234" - -[uptane] -metadata_path = "/var/sota/metadata" -key_source = "pkcs11" -private_key_path = "03" -public_key_path = "03" - diff --git a/recipes-sota/aktualizr/files/sota_implicit_prov.toml b/recipes-sota/aktualizr/files/sota_implicit_prov.toml deleted file mode 100644 index 756c868..0000000 --- a/recipes-sota/aktualizr/files/sota_implicit_prov.toml +++ /dev/null @@ -1,11 +0,0 @@ -[tls] -certificates_directory = "/var/sota/" -ca_file = "/usr/lib/sota/root.crt" -client_certificate = "client.pem" -pkey_file = "pkey.pem" - -[uptane] -metadata_path = "/var/sota/metadata" -private_key_path = "ecukey.der" -public_key_path = "ecukey.pub" - -- cgit v1.2.3-54-g00ecf