me
/
guix
Archived
1
0
Fork 0
Code

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 <ludo@gnu.org>
master
Vagrant Cascadian 2019-03-07 21:50:58 +00:00 committed by Ludovic Courtès
parent 75f0bda71a
commit fb0aeaacea
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/bootloaders.scm
View File

@ -391,7 +391,6 @@ tree binary files. These are board description files used by Linux and BSD.")
("dtc" ,dtc) ("dtc" ,dtc)
("flex" ,flex) ("flex" ,flex)
("lz4" ,lz4) ("lz4" ,lz4)
("openssl" ,openssl)
("python-2" ,python-2) ("python-2" ,python-2)
("python2-coverage" ,python2-coverage) ("python2-coverage" ,python2-coverage)
("python2-pytest" ,python2-pytest) ("python2-pytest" ,python2-pytest)
@ -440,9 +439,14 @@ also initializes the boards (RAM etc).")
(("def test_ctrl_c") (("def test_ctrl_c")
"@pytest.mark.skip(reason='Guix has problems with SIGINT') "@pytest.mark.skip(reason='Guix has problems with SIGINT')
def test_ctrl_c")) def test_ctrl_c"))
;; This test requires a sound system, which is un-used in u-boot-tools.
(for-each (lambda (file) (for-each (lambda (file)
(substitute* 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"))) (("CONFIG_SOUND=y") "CONFIG_SOUND=n")))
(find-files "configs" "sandbox_.*defconfig$")) (find-files "configs" "sandbox_.*defconfig$"))
#t)) #t))