Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 3 --- a/package/jitterentropy-library/Config.in
- 4 +++ b/package/jitterentropy-library/Config.in
- 5 @@ -1,5 +1,6 @@
- 6 config BR2_PACKAGE_JITTERENTROPY_LIBRARY
- 7 bool "libjitterentropy"
- 8 + depends on !BR2_STATIC_LIBS
- 9 help
- 10 Hardware RNG based on CPU timing jitter.
- 11
- 12 diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk
- 13 index 4e791e19dd..2512b7b874 100644
- 14 --- a/package/jitterentropy-library/jitterentropy-library.mk
- 15 +++ b/package/jitterentropy-library/jitterentropy-library.mk
- 16 @@ -11,7 +11,7 @@ JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2
- 17 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES
- 18
- 19 define JITTERENTROPY_LIBRARY_BUILD_CMDS
- 20 - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
- 21 + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
- 22 endef
- 23
- 24 define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS
- 25 diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in
- 26 index bbcf4db843..3b29631c5a 100644
- 27 --- a/package/rng-tools/Config.in
- 28 +++ b/package/rng-tools/Config.in
- 29 @@ -2,7 +2,6 @@ config BR2_PACKAGE_RNG_TOOLS
- 30 bool "rng-tools"
- 31 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || !(BR2_i386 || BR2_x86_64) # libgcrypt
- 32 select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
- 33 - select BR2_PACKAGE_JITTERENTROPY_LIBRARY
- 34 # For rdrand ligcrypt is required and it's not obvious to users
- 35 select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64
- 36 select BR2_PACKAGE_LIBSYSFS
- 37 diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
- 38 index fa23b3316f..b11e6dfb1b 100644
- 39 --- a/package/rng-tools/rng-tools.mk
- 40 +++ b/package/rng-tools/rng-tools.mk
- 41 @@ -8,7 +8,7 @@ RNG_TOOLS_VERSION = 6.7
- 42 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION))
- 43 RNG_TOOLS_LICENSE = GPL-2.0
- 44 RNG_TOOLS_LICENSE_FILES = COPYING
- 45 -RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf
- 46 +RNG_TOOLS_DEPENDENCIES = libsysfs host-pkgconf
- 47
- 48 RNG_TOOLS_AUTORECONF = YES
- 49
- 50 @@ -29,6 +29,12 @@ else
- 51 RNG_TOOLS_CONF_OPTS += --without-libgcrypt
- 52 endif
- 53
- 54 +ifeq ($(BR2_PACKAGE_JITTERENTROPY_LIBRARY),y)
- 55 +RNG_TOOLS_DEPENDENCIES += jitterentropy-library
- 56 +else
- 57 +RNG_TOOLS_CONF_OPTS += --disable-jitterentropy
- 58 +endif
- 59 +
- 60 define RNG_TOOLS_INSTALL_INIT_SYSV
- 61 $(INSTALL) -D -m 755 package/rng-tools/S21rngd \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement