diff options
author | OYTIS <tossel@gmail.com> | 2017-11-16 18:18:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 18:18:59 +0100 |
commit | 55e61fdc92ba340eeb98f7de8fb38328c47ca435 (patch) | |
tree | c8328a8582f4e4b0b6510d298e6ab1112778f66a | |
parent | e47cd9155ca2aaab08029b5bd0fd78dc1e3e1c01 (diff) | |
parent | b1aa5d1c0c27b4026251749e6a7df790df5e49f1 (diff) | |
download | meta-updater-55e61fdc92ba340eeb98f7de8fb38328c47ca435.tar.gz |
Merge pull request #179 from advancedtelematic/bugfix/PRO-4260/createtoken
Delete hsm-test SOTA_CLIENT_FEATURE as redundant and provoking mistakes
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 1 |
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 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" | |||
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" | 6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" |
7 | 7 | ||
8 | DEPENDS = "aktualizr-native" | 8 | DEPENDS = "aktualizr-native" |
9 | RDEPENDS_${PN} = "aktualizr" | 9 | RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken" |
10 | 10 | ||
11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
12 | file://LICENSE \ | 12 | file://LICENSE \ |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 7af7c60..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 | ||
12 | RDEPENDS_${PN}_class-target = "lshw " | 12 | RDEPENDS_${PN}_class-target = "lshw " |
13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} " | 13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} " |
14 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)} " | ||
15 | 14 | ||
16 | PV = "1.0+git${SRCPV}" | 15 | PV = "1.0+git${SRCPV}" |
17 | PR = "7" | 16 | PR = "7" |