diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-06-19 07:59:58 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-19 22:13:42 +0100 |
commit | de7a2d26ec12facbef1d5a92922b4136ee803aaf (patch) | |
tree | 307f203e295decf89c4d6ec69f26e0fbee87c062 /meta/recipes-support/rng-tools/rng-tools/underquote.patch | |
parent | 17e59cab322402bf2b3b7cdd4631d7a05036019c (diff) | |
download | poky-de7a2d26ec12facbef1d5a92922b4136ee803aaf.tar.gz |
rng-tools: 6.6 -> 6.7
Upgrade rng-tools from 6.6 to latest commit 9fc873c which 26 commits
beyond release 6.7:
$ git describe 9fc873c5af0e39263
v6.7-26-g9fc873c
Because it includes some critical fixes such as configure fails and
'Import yocto fixes for 6.6'.
* remove local patches that all are merged by upstream
* backport patch to fix rngd fails to stop issue
* add PACKAGECONFIG libp11
(From OE-Core rev: 3e09c8b5b6517da97a9ec0ce5deb4ba1b066d19b)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/rng-tools/rng-tools/underquote.patch')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/underquote.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/meta/recipes-support/rng-tools/rng-tools/underquote.patch deleted file mode 100644 index aa4bbcb346..0000000000 --- a/meta/recipes-support/rng-tools/rng-tools/underquote.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 03fe7efa1bc04a83fb9b6787998e7baa7ee90646 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Mon, 22 Oct 2018 15:27:41 +0800 | ||
4 | Subject: [PATCH 3/4] Fix underquoted m4 entry. This causes a failure if gcrypt | ||
5 | isn't present: | ||
6 | |||
7 | | configure: libgcrypt support disabled | ||
8 | | ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found | ||
9 | | configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build': | ||
10 | |||
11 | RP | ||
12 | 2016/2/16 | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Rebase to 6.6 | ||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | --- | ||
19 | configure.ac | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index dd1c30f..88d2be3 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -124,7 +124,7 @@ AS_IF( | ||
27 | [test "x$with_libgcrypt" != "xno"], | ||
28 | [ | ||
29 | AC_CHECK_HEADER([gcrypt.h], | ||
30 | - AC_CHECK_LIB( | ||
31 | + [AC_CHECK_LIB( | ||
32 | [gcrypt], | ||
33 | [gcry_check_version], , | ||
34 | [ | ||
35 | @@ -133,7 +133,7 @@ AS_IF( | ||
36 | AC_MSG_NOTICE([libgcrypt support disabled]) | ||
37 | fi | ||
38 | ] | ||
39 | - ), | ||
40 | + )], | ||
41 | [if test "x$with_libgcrypt" != "xcheck"; then | ||
42 | AC_MSG_FAILURE([libgcrypt headers not found]); else | ||
43 | AC_MSG_NOTICE([libgcrypt support disabled]) | ||
44 | -- | ||
45 | 2.7.4 | ||
46 | |||