Merge master into staging-next

2021-03-08 18:22:56 +00:00
parent 277d488026 448151f509
commit 5c2a7abde7
27 changed files with 378 additions and 72 deletions
@@ -435,6 +435,8 @@ let
      SECURITY_APPARMOR                = yes;
      DEFAULT_SECURITY_APPARMOR        = yes;

+      RANDOM_TRUST_CPU                 = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG
+
      MODULE_SIG            = no; # r13y, generates a random key during build and bakes it in
      # Depends on MODULE_SIG and only really helps when you sign your modules
      # and enforce signatures which we don't do by default.