diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-12 14:01:47 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-14 14:57:13 +0100 |
commit | a9d8688a9e7849c70f448abd3c4c44cec9e16a69 (patch) | |
tree | 5aa64dae2b19e54aaa67ae80162bfb4fd7ef39f8 | |
parent | 87d1414e124b352417b080971fc4c4412ab29aa9 (diff) | |
download | meta-updater-a9d8688a9e7849c70f448abd3c4c44cec9e16a69.tar.gz |
No longer require engine-pkcs11.
It was merged into the libp11 package. Bump aktualizr to use the correct
default path (and fix some various OSTree issues). Add opensc as it was
previously a transitive dependency.
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 3 | ||||
-rw-r--r-- | recipes-support/libp11/libp11_0.4.7.bb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 97db19a..0194dbb 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -10,7 +10,6 @@ DEPENDS_append_class-target = "jansson ostree ${@bb.utils.contains('SOTA_CLIENT_ | |||
10 | DEPENDS_append_class-native = "glib-2.0-native " | 10 | 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)} " | ||
14 | RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " | 13 | RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " |
15 | 14 | ||
16 | PV = "1.0+git${SRCPV}" | 15 | PV = "1.0+git${SRCPV}" |
@@ -21,7 +20,7 @@ SRC_URI = " \ | |||
21 | file://aktualizr.service \ | 20 | file://aktualizr.service \ |
22 | file://aktualizr-serialcan.service \ | 21 | file://aktualizr-serialcan.service \ |
23 | " | 22 | " |
24 | SRCREV = "32a04532c1b7434b9cab89b78df389059ac45d40" | 23 | SRCREV = "715dfc3410d46670174ee2f55613e8d953fbb1ae" |
25 | BRANCH ?= "master" | 24 | BRANCH ?= "master" |
26 | 25 | ||
27 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb index 7d77e90..877a57e 100644 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ b/recipes-support/libp11/libp11_0.4.7.bb | |||
@@ -7,6 +7,7 @@ SECTION = "Development/Libraries" | |||
7 | LICENSE = "LGPLv2+" | 7 | LICENSE = "LGPLv2+" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" |
9 | DEPENDS = "libtool openssl" | 9 | DEPENDS = "libtool openssl" |
10 | RDEPENDS_${PN} += " opensc" | ||
10 | 11 | ||
11 | SRC_URI = "git://github.com/OpenSC/libp11.git" | 12 | SRC_URI = "git://github.com/OpenSC/libp11.git" |
12 | SRCREV = "da725ab727342083478150a203a3c80c4551feb4" | 13 | SRCREV = "da725ab727342083478150a203a3c80c4551feb4" |