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-13 15:18:28 +0000 |
| commit | c3b96aaa40413d66d8fc4252235e6fa27dd8db53 (patch) | |
| tree | 184ada4a4e95b3551440550f834efb2c0f7ecea8 /meta | |
| parent | 9a24e79aea2fb3c60803cb265c1d03a1873cfe9d (diff) | |
| download | openembedded-core-contrib-c3b96aaa40413d66d8fc4252235e6fa27dd8db53.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
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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-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 @@ +From 99b0efebd765803203686d89bc4f995bcb103e78 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 10 Nov 2018 09:53:19 +0800 +Subject: [PATCH] configure.ac: fix typo + +Upstream-Status: Submitted [https://github.com/nhorman/rng-tools.git] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4e799dc..0251928 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,7 +62,7 @@ AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])] + AM_CONDITIONAL([JITTER], [false]) + + AC_ARG_ENABLE(jitterentropy, +- AS_HELP_STRING([--disable-jitterntropy | --enable-jitterentropy=<path>], ++ AS_HELP_STRING([--disable-jitterentropy | --enable-jitterentropy=<path>], + [Disable jitterentropy source, or specify its location]), + [if [ test -d $enable_jitterentropy ]; then + export LDFLAGS+=-L$enable_jitterentropy; +-- +2.7.4 + 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 \ file://0002-Add-argument-to-control-the-libargp-dependency.patch \ file://underquote.patch \ file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ + file://0001-configure.ac-fix-typo.patch \ file://init \ file://default \ file://rngd.service \ @@ -24,10 +25,10 @@ DEPENDS = "curl \ " PACKAGECONFIG ??= "libgcrypt libjitterentropy" -PACKAGECONFIG_libc-musl = "libargp" +PACKAGECONFIG_libc-musl = "libargp libjitterentropy" PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," -PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterntropy,libjitterentropy" +PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" # Refer autogen.sh in rng-tools do_configure_prepend() { |