From ee613387c49ca60905e0a40af8af017828c8aec8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Mar 2019 21:50:58 +0000 Subject: [PATCH] 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. --- 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 b0617f452a..15953ab75e 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)) -- 2.20.1