summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-11-16 17:38:17 +0100
committerAnton Gerasimov <anton@advancedtelematic.com>2017-11-16 17:52:18 +0100
commitb1aa5d1c0c27b4026251749e6a7df790df5e49f1 (patch)
tree5e1a2c1b3972fcbc9901ca419a03703de19b0ab4
parent514fbb9fe05e11d8fb8a61d969c6ede76c96538a (diff)
downloadmeta-updater-b1aa5d1c0c27b4026251749e6a7df790df5e49f1.tar.gz
Delete hsm-test SOTA_CLIENT_FEATURE as redundant and provoking mistakes
'SOTA_CLIENT_PROV = "aktualizr-hsm-test-prov"' should set in local.conf in order to build with softhsm
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb2
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb1
2 files changed, 1 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
index c77a5bc..276c17e 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 470c9bf..9a1a7a6 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"