diff options
author | wangmy <wangmy@fujitsu.com> | 2022-02-15 07:54:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 09:46:29 +0000 |
commit | f402b5609062a0c91f40163cba38392985a1c56e (patch) | |
tree | 463eec293c709478105c6617e6297eddd2f3d9be /meta | |
parent | dd3cf99e5021bdb77c5651a7d88816d1d80a9182 (diff) | |
download | poky-f402b5609062a0c91f40163cba38392985a1c56e.tar.gz |
rng-tools: upgrade 6.14 -> 6.15
0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch
0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch
removed since they're included in 6.15.
Changelog:
=========
Adjust rngtests for better behavior in travis
fix use of non-posix setaffinity call to allow building on strict posix (musl) systems
Add armv6l to list of detected arches for pkcs11
misc fixes to allow building on libc-musl
fix a deadlock in jitter shutdown sequence
minor warning fixups (unused variables)
improve cpu detection code
improve jitter cpu monopolization on small/single cpu systems
(From OE-Core rev: 63b1c5ccd178fdd6f8af1d1b9f7fab529b1746e9)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch | 41 | ||||
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch | 47 | ||||
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools_6.15.bb (renamed from meta/recipes-support/rng-tools/rng-tools_6.14.bb) | 4 |
3 files changed, 1 insertions, 91 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch b/meta/recipes-support/rng-tools/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch deleted file mode 100644 index 89edc4c403..0000000000 --- a/meta/recipes-support/rng-tools/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 66e6adc138eef1367d7492fb79ae4da84ed62934 Mon Sep 17 00:00:00 2001 | ||
2 | From: Neil Horman <nhorman@gmail.com> | ||
3 | Date: Thu, 15 Jul 2021 08:43:01 -0400 | ||
4 | Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads | ||
5 | |||
6 | Theres a desire to build rngd with musl, which doesn't have all the gnu | ||
7 | extensions (but it has some). So test for those. Note, this requires | ||
8 | the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Neil Horman <nhorman@tuxdriver.com> | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | configure.ac | 7 +++++++ | ||
15 | 1 file changed, 7 insertions(+) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 9df633d..d0c2179 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD | ||
22 | AM_INIT_AUTOMAKE([foreign]) | ||
23 | AC_CONFIG_HEADERS([rng-tools-config.h]) | ||
24 | AC_CONFIG_MACRO_DIRS([m4]) | ||
25 | +AC_USE_SYSTEM_EXTENSIONS | ||
26 | |||
27 | dnl Parse options | ||
28 | |||
29 | @@ -100,6 +101,12 @@ AS_IF( | ||
30 | ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] | ||
31 | ) | ||
32 | |||
33 | +AC_CHECK_DECL(pthread_attr_setaffinity_np, | ||
34 | + [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], | ||
35 | + [ AC_CHECK_DECL(pthread_setaffinity_np, | ||
36 | + [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include <pthread.h>]]) | ||
37 | + ], [[#include <pthread.h>]]) | ||
38 | + | ||
39 | AS_IF( | ||
40 | [ test "x$with_nistbeacon" != "xno"], | ||
41 | [ | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/meta/recipes-support/rng-tools/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch deleted file mode 100644 index f7470d04bf..0000000000 --- a/meta/recipes-support/rng-tools/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From e4909f329245db52415102e96fc7c99ca1445d05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Neil Horman <nhorman@gmail.com> | ||
3 | Date: Thu, 15 Jul 2021 08:48:10 -0400 | ||
4 | Subject: [PATCH] Allow for use of either pthread affinity set methods | ||
5 | |||
6 | musl has support for pthread_setaffinity_np, but not | ||
7 | pthread_attr_setaffinity_np. so check for hte existence of either | ||
8 | function in configure, and use the appropriate one. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Neil Horman <nhorman@tuxdriver.com> | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | rngd_jitter.c | 15 ++++++++++++++- | ||
15 | 1 file changed, 14 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/rngd_jitter.c b/rngd_jitter.c | ||
18 | index ea29436..5c7e09e 100644 | ||
19 | --- a/rngd_jitter.c | ||
20 | +++ b/rngd_jitter.c | ||
21 | @@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, | ||
22 | for(i=i-1;i>=0;i--) { | ||
23 | CPU_SET(i,cpus); | ||
24 | } | ||
25 | - pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); | ||
26 | |||
27 | + /* | ||
28 | + * Note that only one of: | ||
29 | + * HAVE_PTHREAD_ATTR_SETAFFINITY | ||
30 | + * and | ||
31 | + * HAVE_PTHREAD_SETAFFINITY | ||
32 | + * Will ever be set, as per the configure.ac logic | ||
33 | + */ | ||
34 | +#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY | ||
35 | + pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); | ||
36 | +#endif | ||
37 | ret = -pthread_create(&thread_ctx->notime_thread_id, | ||
38 | &thread_ctx->notime_pthread_attr, | ||
39 | start_routine, arg); | ||
40 | |||
41 | +#ifdef HAVE_PTHREAD_SETAFFINITY | ||
42 | + pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); | ||
43 | +#endif | ||
44 | + | ||
45 | CPU_FREE(cpus); | ||
46 | return ret; | ||
47 | } | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.14.bb b/meta/recipes-support/rng-tools/rng-tools_6.15.bb index 222d7cc630..c4d616e29b 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.14.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.15.bb | |||
@@ -12,10 +12,8 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \ | |||
12 | file://init \ | 12 | file://init \ |
13 | file://default \ | 13 | file://default \ |
14 | file://rngd.service \ | 14 | file://rngd.service \ |
15 | file://0001-Adding-ability-to-detect-non-posix-extensions-for-pt.patch \ | ||
16 | file://0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch \ | ||
17 | " | 15 | " |
18 | SRCREV = "c16176d3800b91f4d016b66733b384493b06f294" | 16 | SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77" |
19 | 17 | ||
20 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
21 | 19 | ||