diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-10 10:03:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-14 11:14:40 +0000 |
commit | 4c034810e5ca6d8be5af9afc9172ac53cf12bf08 (patch) | |
tree | a73cf414af199bbc3fec74625661dbd8e1f5def1 | |
parent | 3eae7a84b270b64410a4886c66629efaf2202329 (diff) | |
download | poky-4c034810e5ca6d8be5af9afc9172ac53cf12bf08.tar.gz |
rng-tools: fix typo of unrecognised options: --disable-jitterntropy
- Fix typo of `--disable-jitterntropy' in both of PACKAGECONFIG and configure --help
- Enable jitterntropy for musl
(From OE-Core rev: c3b96aaa40413d66d8fc4252235e6fa27dd8db53)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch | 27 | ||||
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools_6.6.bb | 5 |
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch b/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch new file mode 100644 index 0000000000..d4d28a01c4 --- /dev/null +++ b/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 99b0efebd765803203686d89bc4f995bcb103e78 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Sat, 10 Nov 2018 09:53:19 +0800 | ||
4 | Subject: [PATCH] configure.ac: fix typo | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/nhorman/rng-tools.git] | ||
7 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
8 | --- | ||
9 | configure.ac | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 4e799dc..0251928 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -62,7 +62,7 @@ AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])] | ||
17 | AM_CONDITIONAL([JITTER], [false]) | ||
18 | |||
19 | AC_ARG_ENABLE(jitterentropy, | ||
20 | - AS_HELP_STRING([--disable-jitterntropy | --enable-jitterentropy=<path>], | ||
21 | + AS_HELP_STRING([--disable-jitterentropy | --enable-jitterentropy=<path>], | ||
22 | [Disable jitterentropy source, or specify its location]), | ||
23 | [if [ test -d $enable_jitterentropy ]; then | ||
24 | export LDFLAGS+=-L$enable_jitterentropy; | ||
25 | -- | ||
26 | 2.7.4 | ||
27 | |||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.6.bb b/meta/recipes-support/rng-tools/rng-tools_6.6.bb index 033af9909d..4d91216e32 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.6.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.6.bb | |||
@@ -7,6 +7,7 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git \ | |||
7 | file://0002-Add-argument-to-control-the-libargp-dependency.patch \ | 7 | file://0002-Add-argument-to-control-the-libargp-dependency.patch \ |
8 | file://underquote.patch \ | 8 | file://underquote.patch \ |
9 | file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ | 9 | file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ |
10 | file://0001-configure.ac-fix-typo.patch \ | ||
10 | file://init \ | 11 | file://init \ |
11 | file://default \ | 12 | file://default \ |
12 | file://rngd.service \ | 13 | file://rngd.service \ |
@@ -24,10 +25,10 @@ DEPENDS = "curl \ | |||
24 | " | 25 | " |
25 | 26 | ||
26 | PACKAGECONFIG ??= "libgcrypt libjitterentropy" | 27 | PACKAGECONFIG ??= "libgcrypt libjitterentropy" |
27 | PACKAGECONFIG_libc-musl = "libargp" | 28 | PACKAGECONFIG_libc-musl = "libargp libjitterentropy" |
28 | PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," | 29 | PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," |
29 | PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," | 30 | PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," |
30 | PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterntropy,libjitterentropy" | 31 | PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" |
31 | 32 | ||
32 | # Refer autogen.sh in rng-tools | 33 | # Refer autogen.sh in rng-tools |
33 | do_configure_prepend() { | 34 | do_configure_prepend() { |