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/fix-rngd-fail-to-stop.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/fix-rngd-fail-to-stop.patch')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/fix-rngd-fail-to-stop.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/fix-rngd-fail-to-stop.patch b/meta/recipes-support/rng-tools/rng-tools/fix-rngd-fail-to-stop.patch new file mode 100644 index 0000000000..58cf3f9d59 --- /dev/null +++ b/meta/recipes-support/rng-tools/rng-tools/fix-rngd-fail-to-stop.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | It fails to stop rngd. It just shows warnings when stop rngd such as by: | ||
2 | |||
3 | $ systemctl stop rngd.service | ||
4 | |||
5 | but stalls shutdown untill daemon rngd is killed. | ||
6 | |||
7 | Backport patch to fix the issue. | ||
8 | |||
9 | Upstream-Status: Backport [https://bugzilla.redhat.com/show_bug.cgi?id=1690364#c8] | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | --- | ||
13 | diff --git a/rngd_jitter.c b/rngd_jitter.c | ||
14 | index 54070ae..7a69bf9 100644 | ||
15 | --- a/rngd_jitter.c | ||
16 | +++ b/rngd_jitter.c | ||
17 | @@ -280,7 +280,7 @@ static void *thread_entropy_task(void *data) | ||
18 | |||
19 | /* Write to pipe */ | ||
20 | written = 0; | ||
21 | - while(written != me->buf_sz) { | ||
22 | + while(me->active && written != me->buf_sz) { | ||
23 | message(LOG_DAEMON|LOG_DEBUG, "Writing to pipe\n"); | ||
24 | ret = write(me->pipe_fd, &tmpbuf[written], me->buf_sz - written); | ||
25 | message(LOG_DAEMON|LOG_DEBUG, "DONE Writing to pipe with return %ld\n", ret); | ||