diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-08 18:30:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-13 09:27:38 +0100 |
commit | e326733d69181a03af7a4f837ea78fce348fdf00 (patch) | |
tree | f2b049b04bf94693ad017ac68df139b4ed655c65 /meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch | |
parent | 04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff) | |
download | poky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz |
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will
continue to be provided for as long as upstream supports it
(and there are still several recipes which do not work with openssl
1.1 due to API differences).
A few files (such as openssl binary) are no longer installed by openssl 1.0,
because they clash with openssl 1.1.
(From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch b/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch new file mode 100644 index 0000000000..736bb39acd --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 3fdb1e2a16ea405c6731447a8994f222808ef7e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 7 Apr 2017 18:01:52 +0300 | ||
4 | Subject: [PATCH] Remove test that requires running as non-root | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | test/recipes/40-test_rehash.t | 17 +---------------- | ||
10 | 1 file changed, 1 insertion(+), 16 deletions(-) | ||
11 | |||
12 | diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t | ||
13 | index f902c23..c7567c1 100644 | ||
14 | --- a/test/recipes/40-test_rehash.t | ||
15 | +++ b/test/recipes/40-test_rehash.t | ||
16 | @@ -23,7 +23,7 @@ setup("test_rehash"); | ||
17 | plan skip_all => "test_rehash is not available on this platform" | ||
18 | unless run(app(["openssl", "rehash", "-help"])); | ||
19 | |||
20 | -plan tests => 5; | ||
21 | +plan tests => 3; | ||
22 | |||
23 | indir "rehash.$$" => sub { | ||
24 | prepare(); | ||
25 | @@ -42,21 +42,6 @@ indir "rehash.$$" => sub { | ||
26 | 'Testing rehash operations on empty directory'); | ||
27 | }, create => 1, cleanup => 1; | ||
28 | |||
29 | -indir "rehash.$$" => sub { | ||
30 | - prepare(); | ||
31 | - chmod 0500, curdir(); | ||
32 | - SKIP: { | ||
33 | - if (!ok(!open(FOO, ">unwritable.txt"), | ||
34 | - "Testing that we aren't running as a privileged user, such as root")) { | ||
35 | - close FOO; | ||
36 | - skip "It's pointless to run the next test as root", 1; | ||
37 | - } | ||
38 | - isnt(run(app(["openssl", "rehash", curdir()])), 1, | ||
39 | - 'Testing rehash operations on readonly directory'); | ||
40 | - } | ||
41 | - chmod 0700, curdir(); # make it writable again, so cleanup works | ||
42 | -}, create => 1, cleanup => 1; | ||
43 | - | ||
44 | sub prepare { | ||
45 | my @pemsourcefiles = sort glob(srctop_file('test', "*.pem")); | ||
46 | my @destfiles = (); | ||
47 | -- | ||
48 | 2.11.0 | ||
49 | |||