diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-08-23 12:26:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:29:46 +0100 |
commit | 2413ff05ba98fc8b44bf1acd666950d252e6a1e9 (patch) | |
tree | 8a01efc3b795f86777bcf06c3a040b165079ba36 /meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch | |
parent | f541b7388cebaceee5867825d250c568b2b1db3c (diff) | |
download | poky-2413ff05ba98fc8b44bf1acd666950d252e6a1e9.tar.gz |
ca-certificates: add recipe (version 20130610)
We need this for certain nativesdk recipes, as we can't rely on the
certificate path or bundle path being the same across distros, and it's useful
in many cases on the target as well.
This is based on the 20130119 recipe from meta-oe, with the following changes:
- use the debian git repository to avoid vanishing sources
- obey our target paths
- default to a sysroot relative to the script location (make relocatable)
- define SUMMARY
- don't inherit autotools, this isn't an autotools package
- add MPL-2.0 to LICENSE, as that's the license of the certdata
- install the script man page
- use a native rather than cross recipe, as it's not bound in any way to the
target system
- add nativesdk to bbclassextend, for use in SDKs
(From OE-Core rev: ad2851cf0abc2ab35e0f60c96d3142c29a07c8fc)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch new file mode 100644 index 0000000000..f4c84fea44 --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001 | ||
4 | From: Andreas Oberritter <obi@opendreambox.org> | ||
5 | Date: Tue, 19 Mar 2013 17:14:33 +0100 | ||
6 | Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT | ||
7 | |||
8 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
9 | --- | ||
10 | sbin/update-ca-certificates | 14 +++++++------- | ||
11 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
12 | |||
13 | diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates | ||
14 | index c567e3d..923b68a 100755 | ||
15 | --- a/sbin/update-ca-certificates | ||
16 | +++ b/sbin/update-ca-certificates | ||
17 | @@ -37,11 +37,11 @@ do | ||
18 | shift | ||
19 | done | ||
20 | |||
21 | -CERTSCONF=/etc/ca-certificates.conf | ||
22 | -CERTSDIR=/usr/share/ca-certificates | ||
23 | -LOCALCERTSDIR=/usr/local/share/ca-certificates | ||
24 | +CERTSCONF=$SYSROOT/etc/ca-certificates.conf | ||
25 | +CERTSDIR=$SYSROOT/usr/share/ca-certificates | ||
26 | +LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates | ||
27 | CERTBUNDLE=ca-certificates.crt | ||
28 | -ETCCERTSDIR=/etc/ssl/certs | ||
29 | +ETCCERTSDIR=$SYSROOT/etc/ssl/certs | ||
30 | |||
31 | cleanup() { | ||
32 | rm -f "$TEMPBUNDLE" | ||
33 | @@ -64,9 +64,9 @@ add() { | ||
34 | PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ | ||
35 | -e 's/[()]/=/g' \ | ||
36 | -e 's/,/_/g').pem" | ||
37 | - if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] | ||
38 | + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] | ||
39 | then | ||
40 | - ln -sf "$CERT" "$PEM" | ||
41 | + ln -sf "${CERT##$SYSROOT}" "$PEM" | ||
42 | echo +$PEM >> "$ADDED" | ||
43 | fi | ||
44 | cat "$CERT" >> "$TEMPBUNDLE" | ||
45 | @@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" | ||
46 | |||
47 | echo "$ADDED_CNT added, $REMOVED_CNT removed; done." | ||
48 | |||
49 | -HOOKSDIR=/etc/ca-certificates/update.d | ||
50 | +HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d | ||
51 | echo -n "Running hooks in $HOOKSDIR...." | ||
52 | VERBOSE_ARG= | ||
53 | [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose | ||
54 | -- | ||
55 | 1.7.10.4 | ||