guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/11: gnu: u-boot-tools: Fix indentation.


From: guix-commits
Subject: 05/11: gnu: u-boot-tools: Fix indentation.
Date: Thu, 1 Dec 2022 11:58:51 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 8d1d209ffe5104ba7c465373d68047d2c082566a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Dec 1 11:28:56 2022 -0500

    gnu: u-boot-tools: Fix indentation.
    
    * gnu/packages/bootloaders.scm (u-boot-tools): Fix indentation.
---
 gnu/packages/bootloaders.scm | 92 ++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index c80d7c8014..c1283d5ef9 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -592,12 +592,12 @@ also initializes the boards (RAM etc).")
          (add-after 'unpack 'patch
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "Makefile"
-              (("/bin/pwd") (which "pwd"))
-              (("/bin/false") (which "false")))
+               (("/bin/pwd") (which "pwd"))
+               (("/bin/false") (which "false")))
              (substitute* "tools/dtoc/fdt_util.py"
-              (("'cc'") "'gcc'"))
+               (("'cc'") "'gcc'"))
              (substitute* "tools/patman/test_util.py"
-              ;; python3-coverage is simply called coverage in guix.
+               ;; python3-coverage is simply called coverage in guix.
                (("python3-coverage") "coverage")
 
                ;; Don't require 100% coverage since it's brittle and can
@@ -605,40 +605,40 @@ also initializes the boards (RAM etc).")
                (("raise ValueError\\('Test coverage failure'\\)")
                 "print('Continuing anyway since Guix does not care :O')"))
              (substitute* "test/run"
-              ;; Make it easier to find test failures.
-              (("#!/bin/bash") "#!/bin/bash -x")
-              ;; This test would require git.
-              (("\\./tools/patman/patman") (which "true"))
-              ;; FIXME: test fails, needs further investiation
-              (("run_test \"binman\"") "# run_test \"binman\"")
-              ;; FIXME: test_spl fails, needs further investiation
-              (("test_ofplatdata or test_handoff or test_spl")
+               ;; Make it easier to find test failures.
+               (("#!/bin/bash") "#!/bin/bash -x")
+               ;; This test would require git.
+               (("\\./tools/patman/patman") (which "true"))
+               ;; FIXME: test fails, needs further investiation
+               (("run_test \"binman\"") "# run_test \"binman\"")
+               ;; FIXME: test_spl fails, needs further investiation
+               (("test_ofplatdata or test_handoff or test_spl")
                 "test_ofplatdata or test_handoff")
-              ;; FIXME: code coverage not working
-              (("run_test \"binman code coverage\"")
-               "# run_test \"binman code coverage\"")
-              ;; This test would require internet access.
-              (("\\./tools/buildman/buildman") (which "true")))
+               ;; FIXME: code coverage not working
+               (("run_test \"binman code coverage\"")
+                "# run_test \"binman code coverage\"")
+               ;; This test would require internet access.
+               (("\\./tools/buildman/buildman") (which "true")))
              (substitute* "test/py/tests/test_sandbox_exit.py"
-              (("def test_ctrl_c")
-               "@pytest.mark.skip(reason='Guix has problems with SIGINT')
+               (("def test_ctrl_c")
+                "@pytest.mark.skip(reason='Guix has problems with SIGINT')
 def test_ctrl_c"))
              ;; Test against the tools being installed rather than tools built
              ;; for "sandbox" target.
              (substitute* "test/image/test-imagetools.sh"
                (("BASEDIR=sandbox") "BASEDIR=."))
              (for-each (lambda (file)
-                              (substitute* file
-                                  ;; Disable features that require OpenSSL due
-                                  ;; to GPL/Openssl license incompatibilities.
-                                  ;; See https://bugs.gnu.org/34717 for
-                                  ;; details.
-                                  (("CONFIG_FIT_SIGNATURE=y")
-                                   
"CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=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$|tools-only_defconfig"))
+                         (substitute* file
+                           ;; Disable features that require OpenSSL due
+                           ;; to GPL/Openssl license incompatibilities.
+                           ;; See https://bugs.gnu.org/34717 for
+                           ;; details.
+                           (("CONFIG_FIT_SIGNATURE=y")
+                            
"CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=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$|tools-only_defconfig"))
              #t))
          (replace 'configure
            (lambda* (#:key make-flags #:allow-other-keys)
@@ -666,22 +666,22 @@ def test_ctrl_c"))
                            "tools/env/fw_printenv"
                            "tools/sunxi-spl-image-builder"))
                #t)))
-           (delete 'check)
-           (add-after 'install 'check
-             (lambda* (#:key make-flags test-target #:allow-other-keys)
-               (invoke "test/image/test-imagetools.sh")))
-           ;; Only run full test suite on x86_64 systems, as many tests
-           ;; assume x86_64.
-           ,@(if (string-match "^x86_64-linux"
-                               (or (%current-target-system)
-                                   (%current-system)))
-                 '((add-after 'check 'check-x86
-                     (lambda* (#:key make-flags test-target #:allow-other-keys)
-                       (apply invoke "make" "mrproper" make-flags)
-                       (setenv "SDL_VIDEODRIVER" "dummy")
-                       (setenv "PAGER" "cat")
-                       (apply invoke "make" test-target make-flags))))
-                 '()))))
+         (delete 'check)
+         (add-after 'install 'check
+           (lambda* (#:key make-flags test-target #:allow-other-keys)
+             (invoke "test/image/test-imagetools.sh")))
+         ;; Only run full test suite on x86_64 systems, as many tests
+         ;; assume x86_64.
+         ,@(if (string-match "^x86_64-linux"
+                             (or (%current-target-system)
+                                 (%current-system)))
+               '((add-after 'check 'check-x86
+                   (lambda* (#:key make-flags test-target #:allow-other-keys)
+                     (apply invoke "make" "mrproper" make-flags)
+                     (setenv "SDL_VIDEODRIVER" "dummy")
+                     (setenv "PAGER" "cat")
+                     (apply invoke "make" test-target make-flags))))
+               '()))))
     (description "U-Boot is a bootloader used mostly for ARM boards.  It
 also initializes the boards (RAM etc).  This package provides its
 board-independent tools.")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]