diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-09-18 10:08:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-18 10:08:07 +0200 |
commit | d19a74303fb573526bc604c7da94daed11883494 (patch) | |
tree | b22f8e785cda3fda24daf45d69757ca89449f8f6 | |
parent | 6257c2aa06967753759db3f7d5b92e496cfbf71c (diff) | |
parent | bfb8c8f3dda143f9c528cbfb2263f110c0099bd9 (diff) | |
download | meta-updater-d19a74303fb573526bc604c7da94daed11883494.tar.gz |
Merge pull request #391 from advancedtelematic/fix/testtoken-openssl-bin
Fix/testtoken openssl bin
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 2 | ||||
-rw-r--r-- | recipes-support/openct/openct_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-support/softhsm-testtoken/softhsm-testtoken.bb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index fd2fdd5..332235b 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -26,7 +26,7 @@ SRC_URI = " \ | |||
26 | file://aktualizr-secondary.socket \ | 26 | file://aktualizr-secondary.socket \ |
27 | file://aktualizr-serialcan.service \ | 27 | file://aktualizr-serialcan.service \ |
28 | " | 28 | " |
29 | SRCREV = "8083d4fa67046689d4bf784b908a048a58457d63" | 29 | SRCREV = "7fc5730719a33c62df394a1fec8488ff5513c90c" |
30 | BRANCH ?= "master" | 30 | BRANCH ?= "master" |
31 | 31 | ||
32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
diff --git a/recipes-support/openct/openct_%.bbappend b/recipes-support/openct/openct_%.bbappend new file mode 100644 index 0000000..52ceeab --- /dev/null +++ b/recipes-support/openct/openct_%.bbappend | |||
@@ -0,0 +1,2 @@ | |||
1 | pkg_postinst_${PN} () { | ||
2 | } | ||
diff --git a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb index 029fe1c..58b521c 100644 --- a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb +++ b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||
7 | RDEPENDS_${PN} = "softhsm libp11" | 7 | RDEPENDS_${PN} = "softhsm libp11 openssl-bin" |
8 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" | 8 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" |
9 | 9 | ||
10 | 10 | ||