[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: u-boot: Remove openssl input.
From: |
guix-commits |
Subject: |
01/03: gnu: u-boot: Remove openssl input. |
Date: |
Fri, 8 Mar 2019 06:34:56 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit fb0aeaaceafd0e748d3720d8d8c05bfc5c8c47cc
Author: Vagrant Cascadian <address@hidden>
Date: Thu Mar 7 21:50:58 2019 +0000
gnu: u-boot: Remove openssl input.
Fixes <https://bugs.gnu.org/34717>.
* gnu/packages/bootloaders (u-boot): Remove openssl from native-inputs.
(u-boot-tools): Disable FIT_SIGNATURES in tests.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/bootloaders.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index b0617f4..15953ab 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -391,7 +391,6 @@ tree binary files. These are board description files used
by Linux and BSD.")
("dtc" ,dtc)
("flex" ,flex)
("lz4" ,lz4)
- ("openssl" ,openssl)
("python-2" ,python-2)
("python2-coverage" ,python2-coverage)
("python2-pytest" ,python2-pytest)
@@ -440,9 +439,14 @@ also initializes the boards (RAM etc).")
(("def test_ctrl_c")
"@pytest.mark.skip(reason='Guix has problems with SIGINT')
def test_ctrl_c"))
- ;; This test requires a sound system, which is un-used in
u-boot-tools.
(for-each (lambda (file)
(substitute* file
+ ;; Disable signatures, due to GPL/Openssl
+ ;; license incompatibilities. See
+ ;; https://bugs.gnu.org/34717 for details.
+ (("CONFIG_FIT_SIGNATURE=y")
"CONFIG_FIT_SIGNATURE=n")
+ ;; This test requires a sound system, which
is un-used
+ ;; in u-boot-tools.
(("CONFIG_SOUND=y") "CONFIG_SOUND=n")))
(find-files "configs" "sandbox_.*defconfig$"))
#t))