diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-16 15:46:08 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-19 07:23:07 +0000 |
commit | dd26c6618f27eaaeae735e2b31b2f1a7b7a48344 (patch) | |
tree | e858732fd338154023972bd78c3a0e92af8a1d05 /recipes/ca-certificates/ca-certificates/default-sysroot.patch | |
parent | c53d98d5efe12859d27885b16b27b13d8afad4ce (diff) | |
download | meta-boot2qt-dd26c6618f27eaaeae735e2b31b2f1a7b7a48344.tar.gz |
ca-certificates: add missing dependency to openssl
openssl and openssl-misc are required for update-ca-certificates to work
correctly when c_rehash is enabled. Instead of having those in packageconfig,
add them here as rdepends.
Remove old ca-certificates recipe as upstream poky has a newer version.
Task-number: QTBUG-57641
Change-Id: I3c76f86ec52c193cedecc51c50805c897b8e03b6
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Diffstat (limited to 'recipes/ca-certificates/ca-certificates/default-sysroot.patch')
-rw-r--r-- | recipes/ca-certificates/ca-certificates/default-sysroot.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/recipes/ca-certificates/ca-certificates/default-sysroot.patch b/recipes/ca-certificates/ca-certificates/default-sysroot.patch deleted file mode 100644 index f8b0791..0000000 --- a/recipes/ca-certificates/ca-certificates/default-sysroot.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | update-ca-certificates: find SYSROOT relative to its own location | ||
4 | |||
5 | This makes the script relocatable. | ||
6 | |||
7 | Index: git/sbin/update-ca-certificates | ||
8 | =================================================================== | ||
9 | --- git.orig/sbin/update-ca-certificates | ||
10 | +++ git/sbin/update-ca-certificates | ||
11 | @@ -66,6 +66,39 @@ do | ||
12 | shift | ||
13 | done | ||
14 | |||
15 | +if [ -z "$SYSROOT" ]; then | ||
16 | + local_which () { | ||
17 | + if [ $# -lt 1 ]; then | ||
18 | + return 1 | ||
19 | + fi | ||
20 | + | ||
21 | + ( | ||
22 | + IFS=: | ||
23 | + for entry in $PATH; do | ||
24 | + if [ -x "$entry/$1" ]; then | ||
25 | + echo "$entry/$1" | ||
26 | + exit 0 | ||
27 | + fi | ||
28 | + done | ||
29 | + exit 1 | ||
30 | + ) | ||
31 | + } | ||
32 | + | ||
33 | + case "$0" in | ||
34 | + */*) | ||
35 | + sbindir=$(cd ${0%/*} && pwd) | ||
36 | + ;; | ||
37 | + *) | ||
38 | + sbindir=$(cd $(dirname $(local_which $0)) && pwd) | ||
39 | + ;; | ||
40 | + esac | ||
41 | + prefix=${sbindir%/*} | ||
42 | + SYSROOT=${prefix%/*} | ||
43 | + if [ ! -d "$SYSROOT/usr/share/ca-certificates" ]; then | ||
44 | + SYSROOT= | ||
45 | + fi | ||
46 | +fi | ||
47 | + | ||
48 | if [ ! -s "$CERTSCONF" ] | ||
49 | then | ||
50 | fresh=1 | ||