Skip to contentSkip to conversation

package/jitterentropy-library: new package

PATCH Superseded Matt Weber 2 participants 3 messages Sep 10, 2019 – Sep 11, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH v2 1/2 package/jitterentropy-library: new package

New library to support rng-tools using a CPU source as a backup entropy source when a kernel provided rng isn't present.

---
Changes v1 -> v2
- No changes

---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 .../0001-Makefile-cleanup-install.patch       | 41 +++++++++++++++++++
 package/jitterentropy-library/Config.in       |  6 +++
 .../jitterentropy-library.hash                |  5 +++
 .../jitterentropy-library.mk                  | 25 +++++++++++
 6 files changed, 79 insertions(+)
 create mode 100644 package/jitterentropy-library/0001-Makefile-cleanup-install.patch
 create mode 100644 package/jitterentropy-library/Config.in
 create mode 100644 package/jitterentropy-library/jitterentropy-library.hash
 create mode 100644 package/jitterentropy-library/jitterentropy-library.mk
DEVELOPERS +1 -0
index 58d18a36e8..9d5e568e9b 100644
@@ -1523,6 +1523,7 @@ F:	package/iperf/
 F:	package/iperf3/
 F:	package/iputils/
 F:	package/iw/
+F:	package/jitterentropy-library/
 F:	package/kvm-unit-tests/
 F:	package/kvmtool/
 F:	package/libcsv/
package/Config.in +1 -0
index 9336261c5d..4a4d388d52 100644
@@ -1378,6 +1378,7 @@ menu "Hardware handling"
 	source "package/gnu-efi/Config.in"
 	source "package/hackrf/Config.in"
 	source "package/hidapi/Config.in"
+	source "package/jitterentropy-library/Config.in"
 	source "package/lcdapi/Config.in"
 	source "package/let-me-create/Config.in"
 	source "package/libaio/Config.in"
package/jitterentropy-library/0001-Makefile-cleanup-install.patch new file +41 -0

41 lines not on this page · raw message

package/jitterentropy-library/Config.in new file +6 -0
new file mode 100644
index 0000000000..02f8ff6164
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_JITTERENTROPY_LIBRARY
+	bool "libjitterentropy"
+	help
+	  Hardware RNG based on CPU timing jitter.
+
+	  https://github.com/smuellerDD/jitterentropy-library
package/jitterentropy-library/jitterentropy-library.hash new file +5 -0
new file mode 100644
index 0000000000..5846f2147d
@@ -0,0 +1,5 @@
+# Locally computed
+sha256	38519115c6b750b7fa15547826123a7821b271535c168823259e609b42847223  jitterentropy-library-2.1.2.tar.gz
+sha256	c3352794eff829a3c8097b77e4cbc9f1faf5c3f47a8abed960a0f411cbc6ab9f  COPYING
+sha256	13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.bsd
+sha256	e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING.gplv2
package/jitterentropy-library/jitterentropy-library.mk new file +25 -0
new file mode 100644
index 0000000000..e047d506ad
@@ -0,0 +1,25 @@
+################################################################################
+#
+# jitterentropy-library
+#
+################################################################################
+
+JITTERENTROPY_LIBRARY_VERSION = 2.1.2
+JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NAME),v$(JITTERENTROPY_LIBRARY_VERSION))
+JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0, BSD-3-Clause
+JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
+JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES
+
+define JITTERENTROPY_LIBRARY_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install
+endef
+
+define JITTERENTROPY_LIBRARY_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 2/2 package/rng-tools: bump to 6.7

* Add new libsysfs dependency for rng available check
* Remove patch adding special return code when no RNG module is available
* Remove exit code corner case in systemd script
* Add new jitterentropy dependency which always provides a entropy source
* Change to a autotools build
* Switch to new site and add license file hash

---
Changes v1 -> v2
[Thomas P
- Added host automake/autotools dependencies and checked for no libtool dependency.

[Baruch
- Removed cut paste error in comment for autoreconf

---
 package/rng-tools/0001-rngd-exit-code.patch | 22 ---------------------
 package/rng-tools/Config.in                 |  2 ++
 package/rng-tools/rng-tools.hash            |  6 +++---
 package/rng-tools/rng-tools.mk              | 17 ++++++++++++++--
 package/rng-tools/rngd.service              |  1 -
 5 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 package/rng-tools/0001-rngd-exit-code.patch
package/rng-tools/0001-rngd-exit-code.patch deleted +0 -22
deleted file mode 100644
index 709e20c70d..0000000000
@@ -1,22 +0,0 @@
-Exit with a special value when RNG modules are not available
-
-Instead of returning with an error, exit with a special value when the
-RNG kernel modules are not present in the kernel. This is not really a
-hard failure.
-
-Patch borrowed from Fedora, at
-http://pkgs.fedoraproject.org/cgit/rng-tools.git/tree/rngd-exit-code.patch.
-
-Signed-off-by: Maxim Mikityanskiy <[email protected]>
-
---- a/rngd.c
-+++ b/rngd.c
-@@ -319,7 +319,7 @@ int main(int argc, char **argv)
- 			message(LOG_DAEMON|LOG_ERR,
- 				"Maybe RNG device modules are not loaded\n");
- 		}
--		return 1;
-+		return 66;
- 	}
- 
- 	if (arguments->verbose) {
package/rng-tools/Config.in +2 -0
index b00477d336..18521bdd90 100644
@@ -4,6 +4,8 @@ config BR2_PACKAGE_RNG_TOOLS
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	# For rdrand ligcrypt is required and it's not obvious to users
 	select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_LIBSYSFS
+	select BR2_PACKAGE_JITTERENTROPY_LIBRARY
 	help
 	  Daemon to use hardware random number generators.
 
package/rng-tools/rng-tools.hash +3 -3
index 09769e4622..a0771034fe 100644
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/gkernel/files/rng-tools/5/
-md5	6726cdc6fae1f5122463f24ae980dd68	rng-tools-5.tar.gz
-sha1	3092768ac45315a5dcc0170d05566d1d00dbad96	rng-tools-5.tar.gz
+# Locally computed
+sha256	b85e3530dbf943b6da03ebecaf64d0a4febfcc4f562fc7f8d886483906b15f08  rng-tools-6.7.tar.gz
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/rng-tools/rng-tools.mk +15 -2
index bbb1a64c15..02920cf53c 100644
@@ -4,10 +4,23 @@
 #
 ################################################################################
 
-RNG_TOOLS_VERSION = 5
-RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
+RNG_TOOLS_VERSION = 6.7
+RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION))
 RNG_TOOLS_LICENSE = GPL-2.0
 RNG_TOOLS_LICENSE_FILES = COPYING
+RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-automake \
+			host-autoconf
+
+# configure is missing but pkg seems to not be compatible with our autoreconf
+# mechanism so we have to do it manually
+define RNG_TOOLS_RUN_AUTOGEN
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+RNG_TOOLS_PRE_CONFIGURE_HOOKS += RNG_TOOLS_RUN_AUTOGEN
+
+RNG_TOOLS_CONF_OPTS = \
+	--without-nistbeacon \
+	--without-pkcs11
 
 # Work around for uClibc or musl toolchains which lack argp_*()
 # functions.
package/rng-tools/rngd.service +0 -1
index c0bcffe59e..11386d1e5d 100644
@@ -3,7 +3,6 @@ Description=Hardware RNG Entropy Gatherer Daemon
 
 [Service]
 ExecStart=/usr/sbin/rngd -f $DAEMON_ARGS
-SuccessExitStatus=66
 EnvironmentFile=-/etc/default/rngd
 
 [Install]
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/2 package/rng-tools: bump to 6.7

Quoted 7 lines · On Tue, 10 Sep 2019 15:39:02 -0500 Matt Weber…

* Add new libsysfs dependency for rng available check
* Remove patch adding special return code when no RNG module is available
* Remove exit code corner case in systemd script
* Add new jitterentropy dependency which always provides a entropy source
* Change to a autotools build
* Switch to new site and add license file hash

Quoted 6 lines

---
Changes v1 -> v2
[Thomas P
- Added host automake/autotools dependencies and checked for no libtool dependency.

As I replied to your v1 just a few minutes ago, if the issue with <pkg>_AUTORECONF = YES is just the README being missing, then there's a simple and good solution of adding the "foreign" argument to AM_INIT_AUTOMAKE. This should be a simple upstreamable patch.

Of course, for upstreaming, you can drop the line in autogen.sh that copies README.md into README.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com