Advertisement
Guest User

Untitled

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