diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-01-30 12:08:56 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-01-30 12:08:56 +0100 |
commit | 5f033dd60d20ce332d3f1d8d44e296791660d6d3 (patch) | |
tree | 6262dc58283dced59f80b1302ddf005a60eea86e | |
parent | 4d1b5eef40ec0c9587bbb99e24f75e36f4c77df7 (diff) | |
download | meta-updater-5f033dd60d20ce332d3f1d8d44e296791660d6d3.tar.gz |
Minor changes to keep hsm and implicit recipes consistent.
At present they should be very similar. The only outstanding difference
(other than the HSM parts) is whether the root CA is installed.
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 9 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 944607c..5f8da3c 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | SUMMARY = "Aktualizr configuration with HSM support" | 1 | SUMMARY = "Aktualizr configuration with HSM support" |
2 | DESCRIPTION = "Systemd service and configurations for Aktualizr, the SOTA Client application written in C++" | 2 | DESCRIPTION = "Systemd service and configurations for HSM provisioning with Aktualizr, the SOTA Client application written in C++" |
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | 3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
@@ -14,14 +14,15 @@ SRC_URI = " \ | |||
14 | PV = "1.0" | 14 | PV = "1.0" |
15 | PR = "6" | 15 | PR = "6" |
16 | 16 | ||
17 | |||
18 | require environment.inc | 17 | require environment.inc |
19 | require credentials.inc | 18 | require credentials.inc |
20 | 19 | ||
21 | do_install() { | 20 | do_install() { |
22 | install -d ${D}${libdir}/sota | 21 | install -d ${D}${libdir}/sota |
23 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ | 22 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
24 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} | 23 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ |
24 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} | ||
25 | fi | ||
25 | } | 26 | } |
26 | 27 | ||
27 | FILES_${PN} = " \ | 28 | FILES_${PN} = " \ |
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index b5bf420..cf3d22c 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb | |||
@@ -4,15 +4,15 @@ HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | |||
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" | 6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" |
7 | |||
7 | DEPENDS = "aktualizr-native" | 8 | DEPENDS = "aktualizr-native" |
8 | RDEPENDS_${PN} = "aktualizr" | 9 | RDEPENDS_${PN} = "aktualizr" |
9 | PV = "1.0" | ||
10 | PR = "1" | ||
11 | 10 | ||
12 | SRC_URI = " \ | 11 | SRC_URI = " \ |
13 | file://LICENSE \ | 12 | file://LICENSE \ |
14 | " | 13 | " |
15 | 14 | PV = "1.0" | |
15 | PR = "1" | ||
16 | 16 | ||
17 | require environment.inc | 17 | require environment.inc |
18 | require credentials.inc | 18 | require credentials.inc |