summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-09-18 10:08:07 +0200
committerGitHub <noreply@github.com>2018-09-18 10:08:07 +0200
commitd19a74303fb573526bc604c7da94daed11883494 (patch)
treeb22f8e785cda3fda24daf45d69757ca89449f8f6
parent6257c2aa06967753759db3f7d5b92e496cfbf71c (diff)
parentbfb8c8f3dda143f9c528cbfb2263f110c0099bd9 (diff)
downloadmeta-updater-d19a74303fb573526bc604c7da94daed11883494.tar.gz
Merge pull request #391 from advancedtelematic/fix/testtoken-openssl-bin
Fix/testtoken openssl bin
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb2
-rw-r--r--recipes-support/openct/openct_%.bbappend2
-rw-r--r--recipes-support/softhsm-testtoken/softhsm-testtoken.bb2
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 "
29SRCREV = "8083d4fa67046689d4bf784b908a048a58457d63" 29SRCREV = "7fc5730719a33c62df394a1fec8488ff5513c90c"
30BRANCH ?= "master" 30BRANCH ?= "master"
31 31
32S = "${WORKDIR}/git" 32S = "${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 @@
1pkg_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
5inherit systemd 5inherit systemd
6 6
7RDEPENDS_${PN} = "softhsm libp11" 7RDEPENDS_${PN} = "softhsm libp11 openssl-bin"
8DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" 8DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
9 9
10 10