summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-05-19 17:59:31 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-05-21 11:06:25 +0300
commit2548e68fdc74edc7b5da703565bc777da7f2cd8d (patch)
tree16363a7d310dca9d9fb417334b554227b49a1462
parent506533ebc0e592b34d68bb1fa944866edf3e389d (diff)
downloadmeta-boot2qt-2548e68fdc74edc7b5da703565bc777da7f2cd8d.tar.gz
openssl: make sure c_rehash is included in the image
And make /usr/lib/ssl/certs symbolic link to /etc/ssl/certs, so that ca-certificates are used. Task-number: QTEE-502 Change-Id: Id673b5db066b184465425b56df9c1fa41e68fa70 Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
-rw-r--r--recipes/openssl/openssl_1.0.1g.bbappend28
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend
new file mode 100644
index 0000000..1ba0a2e
--- /dev/null
+++ b/recipes/openssl/openssl_1.0.1g.bbappend
@@ -0,0 +1,28 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23PACKAGECONFIG += "perl"
24
25do_install_append () {
26 rmdir ${D}${libdir}/ssl/certs
27 ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/
28}
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index e7f15bb..bcc7868 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} = "\
32 psplash \ 32 psplash \
33 openssh-sftp-server \ 33 openssh-sftp-server \
34 openssl \ 34 openssl \
35 openssl-misc \
35 libpng \ 36 libpng \
36 jpeg \ 37 jpeg \
37 tiff \ 38 tiff \