diff options
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 6 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 5 | ||||
-rw-r--r-- | recipes-sota/aktualizr/credentials.inc | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index c8f0741..67bd2c2 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb | |||
@@ -25,8 +25,10 @@ do_install() { | |||
25 | install -d ${D}${systemd_unitdir}/system | 25 | install -d ${D}${systemd_unitdir}/system |
26 | install -m 0644 ${WORKDIR}/aktualizr.service ${D}${systemd_unitdir}/system/aktualizr.service | 26 | install -m 0644 ${WORKDIR}/aktualizr.service ${D}${systemd_unitdir}/system/aktualizr.service |
27 | install -d ${D}${libdir}/sota | 27 | install -d ${D}${libdir}/sota |
28 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ | 28 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
29 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} | 29 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ |
30 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} | ||
31 | fi | ||
30 | } | 32 | } |
31 | 33 | ||
32 | FILES_${PN} = " \ | 34 | FILES_${PN} = " \ |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 457abfd..e4ffc5a 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -18,7 +18,7 @@ PR = "7" | |||
18 | SRC_URI = " \ | 18 | SRC_URI = " \ |
19 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ | 19 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ |
20 | " | 20 | " |
21 | SRCREV = "57e9cdb8aa1e8ee9e682628bd67031d9be7aaafa" | 21 | SRCREV = "5bf2975aee4af667a1af17381bf68c34a00f03a3" |
22 | BRANCH ?= "master" | 22 | BRANCH ?= "master" |
23 | 23 | ||
24 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
@@ -36,10 +36,12 @@ do_install_append () { | |||
36 | } | 36 | } |
37 | do_install_append_class-target () { | 37 | do_install_append_class-target () { |
38 | rm -f ${D}${bindir}/aktualizr_implicit_writer | 38 | rm -f ${D}${bindir}/aktualizr_implicit_writer |
39 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '', 'rm -f ${D}${bindir}/example-interface', d)} | ||
39 | } | 40 | } |
40 | do_install_append_class-native () { | 41 | do_install_append_class-native () { |
41 | rm -f ${D}${bindir}/aktualizr | 42 | rm -f ${D}${bindir}/aktualizr |
42 | rm -f ${D}${bindir}/aktualizr-info | 43 | rm -f ${D}${bindir}/aktualizr-info |
44 | rm -f ${D}${bindir}/example-interface | ||
43 | install -d ${D}${libdir}/sota | 45 | install -d ${D}${libdir}/sota |
44 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | 46 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml |
45 | install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml | 47 | install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml |
@@ -50,6 +52,7 @@ FILES_${PN}_class-target = " \ | |||
50 | ${bindir}/aktualizr \ | 52 | ${bindir}/aktualizr \ |
51 | ${bindir}/aktualizr-info \ | 53 | ${bindir}/aktualizr-info \ |
52 | " | 54 | " |
55 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '${bindir}/example-interface', '', d)} " | ||
53 | FILES_${PN}_class-native = " \ | 56 | FILES_${PN}_class-native = " \ |
54 | ${bindir}/aktualizr_implicit_writer \ | 57 | ${bindir}/aktualizr_implicit_writer \ |
55 | ${bindir}/garage-deploy \ | 58 | ${bindir}/garage-deploy \ |
diff --git a/recipes-sota/aktualizr/credentials.inc b/recipes-sota/aktualizr/credentials.inc index fe09550..256c8ff 100644 --- a/recipes-sota/aktualizr/credentials.inc +++ b/recipes-sota/aktualizr/credentials.inc | |||
@@ -1 +1 @@ | |||
SRC_URI_append = "${@'file://${SOTA_PACKED_CREDENTIALS}' if d.getVar('SOTA_PACKED_CREDENTIALS', True) else ' '}" | SRC_URI_append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS', True)) if d.getVar('SOTA_PACKED_CREDENTIALS', True) else ''}" | ||