* [ptxdist] [PATCH 1/2] rng-tools: pin down license files
@ 2021-08-12 13:17 Roland Hieber
2021-08-12 13:17 ` [ptxdist] [PATCH 2/2] rng-tools: version bump v6.5 -> v6.14 Roland Hieber
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Roland Hieber @ 2021-08-12 13:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/rng-tools.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 5d8a09cee153..93d1b522588b 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -17,6 +17,10 @@ RNG_TOOLS_URL := https://github.com/nhorman/rng-tools/archive/v$(RNG_TOOLS_VERS
RNG_TOOLS_SOURCE := $(SRCDIR)/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX)
RNG_TOOLS_DIR := $(BUILDDIR)/$(RNG_TOOLS)
RNG_TOOLS_LICENSE := GPL-2.0-or-later
+RNG_TOOLS_LICENSE_FILES := \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://rngd.c;startline=12;endline=26;md5=8737e0a69b00f9cb52b9411c81aaa1d5 \
+ file://rngtest.c;startline=7;endline=21;md5=0bf96e235e77c1ff6cab766073094c7f
# ----------------------------------------------------------------------------
# Prepare
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH 2/2] rng-tools: version bump v6.5 -> v6.14 2021-08-12 13:17 [ptxdist] [PATCH 1/2] rng-tools: pin down license files Roland Hieber @ 2021-08-12 13:17 ` Roland Hieber 2021-08-13 9:44 ` [ptxdist] [PATCH v2 2/3] " Roland Hieber 2021-08-12 13:42 ` [ptxdist] [PATCH 3/2] rng-tools: fix dependency for systemd services and init script Roland Hieber 2021-10-20 9:39 ` [ptxdist] [APPLIED] rng-tools: pin down license files Michael Olbrich 2 siblings, 1 reply; 9+ messages in thread From: Roland Hieber @ 2021-08-12 13:17 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber 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. The patch was applied upstream, but ./configure still needs to be generated. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- .../autogen.sh | 0 ...0001-Buildsystem-fix-autotools-setup.patch | 25 ------------------- patches/rng-tools-6.5/series | 4 --- rules/rng-tools.in | 2 +- rules/rng-tools.make | 11 +++++--- 5 files changed, 8 insertions(+), 34 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..eed76200987a 100644 --- a/rules/rng-tools.in +++ b/rules/rng-tools.in @@ -5,7 +5,7 @@ menuconfig RNG_TOOLS 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH v2 2/3] rng-tools: version bump v6.5 -> v6.14 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 2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich 0 siblings, 1 reply; 9+ messages in thread From: Roland Hieber @ 2021-08-13 9:44 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] rng-tools: version bump v6.5 -> v6.14 2021-08-13 9:44 ` [ptxdist] [PATCH v2 2/3] " Roland Hieber @ 2021-10-20 9:39 ` Michael Olbrich 0 siblings, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2021-10-20 9:39 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Thanks, applied as 38fe011f7e28189764b108fb76d4cb9f4a49fb2a. Michael [sent from post-receive hook] On Wed, 20 Oct 2021 11:39:49 +0200, Roland Hieber <rhi@pengutronix.de> wrote: > 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> > Message-Id: <20210813094446.13958-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > 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 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH 3/2] rng-tools: fix dependency for systemd services and init script 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-12 13:42 ` 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-10-20 9:39 ` [ptxdist] [APPLIED] rng-tools: pin down license files Michael Olbrich 2 siblings, 2 replies; 9+ messages in thread From: Roland Hieber @ 2021-08-12 13:42 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Both call rngd, so it does not make sense to install them without rngd. Furthermore, the systemd unit is useless without systemd itself. Fixes: 88f17567fbef465e9bf2 (2021-06-07, "rng-tools: allow installing rngtest without rngd") Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/rng-tools.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/rng-tools.in b/rules/rng-tools.in index eed76200987a..a9dc01340243 100644 --- a/rules/rng-tools.in +++ b/rules/rng-tools.in @@ -25,12 +25,13 @@ config RNG_TOOLS_RNGD config RNG_TOOLS_STARTSCRIPT bool default y - depends on RNG_TOOLS && INITMETHOD_BBINIT + depends on RNG_TOOLS_RNGD && INITMETHOD_BBINIT prompt "install /etc/init.d/rngd" config RNG_TOOLS_SYSTEMD_UNIT bool default y + depends on RNG_TOOLS_RNGD && INITMETHOD_SYSTEMD depends on SYSTEMD prompt "install systemd unit files" -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 3/2] rng-tools: fix dependency for systemd services and init script 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 1 sibling, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2021-09-03 14:20 UTC (permalink / raw) To: Roland Hieber, ptxdist On Thu, Aug 12, 2021 at 03:42:54PM +0200, Roland Hieber wrote: > Both call rngd, so it does not make sense to install them without rngd. > Furthermore, the systemd unit is useless without systemd itself. > > Fixes: 88f17567fbef465e9bf2 (2021-06-07, "rng-tools: allow installing rngtest without rngd") > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > --- > rules/rng-tools.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/rules/rng-tools.in b/rules/rng-tools.in > index eed76200987a..a9dc01340243 100644 > --- a/rules/rng-tools.in > +++ b/rules/rng-tools.in > @@ -25,12 +25,13 @@ config RNG_TOOLS_RNGD > config RNG_TOOLS_STARTSCRIPT > bool > default y > - depends on RNG_TOOLS && INITMETHOD_BBINIT > + depends on RNG_TOOLS_RNGD && INITMETHOD_BBINIT > prompt "install /etc/init.d/rngd" > > config RNG_TOOLS_SYSTEMD_UNIT > bool > default y > + depends on RNG_TOOLS_RNGD && INITMETHOD_SYSTEMD > depends on SYSTEMD Either INITMETHOD_SYSTEMD or SYSTEMD but not both. Michael > prompt "install systemd unit files" > > -- > 2.30.2 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH v2 3/2] rng-tools: fix dependency for init script and systemd unit 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 ` Roland Hieber 2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich 1 sibling, 1 reply; 9+ messages in thread From: Roland Hieber @ 2021-10-24 20:31 UTC (permalink / raw) To: ptxdist Both call rngd, so it does not make sense to install them without rngd. Furthermore, the systemd unit is useless without systemd itself. Fixes: 88f17567fbef465e9bf2 (2021-06-07, "rng-tools: allow installing rngtest without rngd") Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- v1 -> v2: * remove superfluous "depends on SYSTEMD" line * select RNG_TOOLS_RNGD instead of depending on it rules/rng-tools.in | 2 +- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/rng-tools.in b/rules/rng-tools.in index eed76200987a..a9dc01340243 100644 --- a/rules/rng-tools.in +++ b/rules/rng-tools.in @@ -25,12 +25,14 @@ config RNG_TOOLS_RNGD config RNG_TOOLS_STARTSCRIPT bool default y - depends on RNG_TOOLS && INITMETHOD_BBINIT + select RNG_TOOLS_RNGD + depends on INITMETHOD_BBINIT prompt "install /etc/init.d/rngd" config RNG_TOOLS_SYSTEMD_UNIT bool default y - depends on SYSTEMD + depends on INITMETHOD_SYSTEMD + select RNG_TOOLS_RNGD prompt "install systemd unit files" -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] rng-tools: fix dependency for init script and systemd unit 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 ` Michael Olbrich 0 siblings, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2021-11-05 7:55 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Thanks, applied as 1f4688b04f35887b7abfbde8004351f40b2b8d43. Michael [sent from post-receive hook] On Fri, 05 Nov 2021 08:55:24 +0100, Roland Hieber <rhi@pengutronix.de> wrote: > Both call rngd, so it does not make sense to install them without rngd. > Furthermore, the systemd unit is useless without systemd itself. > > Fixes: 88f17567fbef465e9bf2 (2021-06-07, "rng-tools: allow installing rngtest without rngd") > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > Message-Id: <20211024203158.vgnpwg2we3m6y3zt@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/rng-tools.in b/rules/rng-tools.in > index e8e5b776cf97..5e68791d3c66 100644 > --- a/rules/rng-tools.in > +++ b/rules/rng-tools.in > @@ -24,13 +24,15 @@ config RNG_TOOLS_RNGD > config RNG_TOOLS_STARTSCRIPT > bool > default y > - depends on RNG_TOOLS && INITMETHOD_BBINIT > + select RNG_TOOLS_RNGD > + depends on INITMETHOD_BBINIT > prompt "install /etc/init.d/rngd" > > config RNG_TOOLS_SYSTEMD_UNIT > bool > default y > - depends on SYSTEMD > + depends on INITMETHOD_SYSTEMD > + select RNG_TOOLS_RNGD > prompt "install systemd unit files" > > config RNG_TOOLS_RNGTEST _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] rng-tools: pin down license files 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-12 13:42 ` [ptxdist] [PATCH 3/2] rng-tools: fix dependency for systemd services and init script Roland Hieber @ 2021-10-20 9:39 ` Michael Olbrich 2 siblings, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2021-10-20 9:39 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Thanks, applied as ff01b268050839acc4fdf024aea0efe7fc8ac1ca. Michael [sent from post-receive hook] On Wed, 20 Oct 2021 11:39:48 +0200, Roland Hieber <rhi@pengutronix.de> wrote: > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > Message-Id: <20210812131711.5528-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/rng-tools.make b/rules/rng-tools.make > index 5d8a09cee153..93d1b522588b 100644 > --- a/rules/rng-tools.make > +++ b/rules/rng-tools.make > @@ -17,6 +17,10 @@ RNG_TOOLS_URL := https://github.com/nhorman/rng-tools/archive/v$(RNG_TOOLS_VERS > RNG_TOOLS_SOURCE := $(SRCDIR)/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX) > RNG_TOOLS_DIR := $(BUILDDIR)/$(RNG_TOOLS) > RNG_TOOLS_LICENSE := GPL-2.0-or-later > +RNG_TOOLS_LICENSE_FILES := \ > + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + file://rngd.c;startline=12;endline=26;md5=8737e0a69b00f9cb52b9411c81aaa1d5 \ > + file://rngtest.c;startline=7;endline=21;md5=0bf96e235e77c1ff6cab766073094c7f > > # ---------------------------------------------------------------------------- > # Prepare _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-11-05 7:56 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 ` [ptxdist] [PATCH v2 2/3] " Roland Hieber 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox