From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH v2 2/3] rng-tools: version bump v6.5 -> v6.14
Date: Fri, 13 Aug 2021 11:44:46 +0200 [thread overview]
Message-ID: <20210813094446.13958-1-rhi@pengutronix.de> (raw)
In-Reply-To: <20210812131711.5528-2-rhi@pengutronix.de>
The old version of rng-tools didn't use libgcrypt, but linked to it
nevertheless; however it moved from libgcrypt to openssl anyway in the
new version, and also removed the libsysfs dependency. The patch was
applied upstream, but ./configure still needs to be generated.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- remove unneeded libsysfs dependency. Rest of the series stays the same.
.../autogen.sh | 0
...0001-Buildsystem-fix-autotools-setup.patch | 25 -------------------
patches/rng-tools-6.5/series | 4 ---
rules/rng-tools.in | 3 +--
rules/rng-tools.make | 11 +++++---
5 files changed, 8 insertions(+), 35 deletions(-)
rename patches/{rng-tools-6.5 => rng-tools-6.14}/autogen.sh (100%)
delete mode 100644 patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch
delete mode 100644 patches/rng-tools-6.5/series
diff --git a/patches/rng-tools-6.5/autogen.sh b/patches/rng-tools-6.14/autogen.sh
similarity index 100%
rename from patches/rng-tools-6.5/autogen.sh
rename to patches/rng-tools-6.14/autogen.sh
diff --git a/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch b/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch
deleted file mode 100644
index 9f03d86a0b14..000000000000
--- a/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Juergen Borleis <jbe@pengutronix.de>
-Date: Mon, 15 Oct 2018 12:51:16 +0200
-Subject: [PATCH] Buildsystem: fix autotools setup
-
-Using 'gnu' forces the existence of various files, which are not present
-in this repository ('README' for example).
-
-Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b1544d9aefcb..6eaed1071869 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@ AC_INIT(rng-tools, 6.5, [Neil Horman <nhorman@tuxdriver.com>])
- AC_PREREQ(2.52)
- AC_CONFIG_SRCDIR([rngd.c])
- AC_CANONICAL_TARGET
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([foreign])
- AC_CONFIG_HEADERS([rng-tools-config.h])
- AC_CONFIG_MACRO_DIRS([m4])
-
diff --git a/patches/rng-tools-6.5/series b/patches/rng-tools-6.5/series
deleted file mode 100644
index 48616bf4538d..000000000000
--- a/patches/rng-tools-6.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Buildsystem-fix-autotools-setup.patch
-# 05372db98be6dd445f49fca3ec398a6f - git-ptx-patches magic
diff --git a/rules/rng-tools.in b/rules/rng-tools.in
index 24bcd048f268..e8e5b776cf97 100644
--- a/rules/rng-tools.in
+++ b/rules/rng-tools.in
@@ -3,9 +3,8 @@
menuconfig RNG_TOOLS
tristate
prompt "rng-tools rngd "
- select LIBSYSFS
select LIBC_PTHREAD
- select LIBGCRYPT
+ select OPENSSL
help
random number generator daemon - seed kernel random from hwrng
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 93d1b522588b..8436fb15931f 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -9,8 +9,8 @@
PACKAGES-$(PTXCONF_RNG_TOOLS) += rng-tools
-RNG_TOOLS_VERSION := 6.5
-RNG_TOOLS_MD5 := c153517cc73f7f2a899bf59df06ed1ce
+RNG_TOOLS_VERSION := 6.14
+RNG_TOOLS_MD5 := 917d21dd2b06816b0484e220dfb5ba4b
RNG_TOOLS := rng-tools-$(RNG_TOOLS_VERSION)
RNG_TOOLS_SUFFIX := tar.gz
RNG_TOOLS_URL := https://github.com/nhorman/rng-tools/archive/v$(RNG_TOOLS_VERSION).$(RNG_TOOLS_SUFFIX)
@@ -29,8 +29,11 @@ RNG_TOOLS_LICENSE_FILES := \
RNG_TOOLS_CONF_TOOL := autoconf
RNG_TOOLS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --with-libgcrypt \
- --without-nistbeacon
+ --disable-jitterentropy \
+ --without-nistbeacon \
+ --without-pkcs11 \
+ --without-rtlsdr \
+ --without-libargp
# ----------------------------------------------------------------------------
# Target-Install
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-08-13 9:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-12 13:17 [ptxdist] [PATCH 1/2] rng-tools: pin down license files Roland Hieber
2021-08-12 13:17 ` [ptxdist] [PATCH 2/2] rng-tools: version bump v6.5 -> v6.14 Roland Hieber
2021-08-13 9:44 ` Roland Hieber [this message]
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-08-12 13:42 ` [ptxdist] [PATCH 3/2] rng-tools: fix dependency for systemd services and init script Roland Hieber
2021-09-03 14:20 ` Michael Olbrich
2021-10-24 20:31 ` [ptxdist] [PATCH v2 3/2] rng-tools: fix dependency for init script and systemd unit Roland Hieber
2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-20 9:39 ` [ptxdist] [APPLIED] rng-tools: pin down license files Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210813094446.13958-1-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox