diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:47:02 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:47:02 +0100 |
| commit | 96ab233df7eefd4c868a9e9628b834458e9f18d3 (patch) | |
| tree | ee28a833f9126245d394bf5b2674c7ced3a3bba8 /gnu/packages/bootloaders.scm | |
| parent | b4d7689f9255b93b9ea02e01dc490f1416f77782 (diff) | |
| parent | a4de1a651e75c9b9d5e6bdb993f5bd5f74875d49 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 8 |
1 files 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)) |