summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2017-11-17 17:18:41 +0100
committerGitHub <noreply@github.com>2017-11-17 17:18:41 +0100
commit397fb34ea22088a697f58c6d0ad8604a23160972 (patch)
tree00fe8451514fd899703e727db4c5c6da6337d040 /recipes-sota
parent71410bd31ec76e55247807551e68a2061e277b08 (diff)
parenteab456117ad96a43104cef95c68d9bddf4c65872 (diff)
downloadmeta-updater-397fb34ea22088a697f58c6d0ad8604a23160972.tar.gz
Merge pull request #184 from advancedtelematic/feat/PRO-4252/rocko
Feat/pro 4252/rocko
Diffstat (limited to 'recipes-sota')
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb2
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
index b14dc29..c443c56 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
@@ -6,7 +6,7 @@ LICENSE = "MPL-2.0"
6LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" 6LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
7 7
8DEPENDS = "aktualizr-native" 8DEPENDS = "aktualizr-native"
9RDEPENDS_${PN} = "aktualizr" 9RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken"
10 10
11SRC_URI = " \ 11SRC_URI = " \
12 file://LICENSE \ 12 file://LICENSE \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index c98027d..162065e 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -11,7 +11,6 @@ DEPENDS_append_class-native = "glib-2.0-native "
11 11
12RDEPENDS_${PN}_class-target = "lshw " 12RDEPENDS_${PN}_class-target = "lshw "
13RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} " 13RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} "
14RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)} "
15 14
16PV = "1.0+git${SRCPV}" 15PV = "1.0+git${SRCPV}"
17PR = "7" 16PR = "7"
@@ -47,5 +46,6 @@ FILES_${PN}_class-target = " \
47 " 46 "
48FILES_${PN}_class-native = " \ 47FILES_${PN}_class-native = " \
49 ${bindir}/aktualizr_implicit_writer \ 48 ${bindir}/aktualizr_implicit_writer \
49 ${bindir}/garage-deploy \
50 ${bindir}/garage-push \ 50 ${bindir}/garage-push \
51 " 51 "