[bug#32982] [PATCH] gnu: u-boot: Update to 2018.09.

[bug#32982] [PATCH] gnu: u-boot: Update to 2018.09.

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 2362 bytes --]

* gnu/packages/bootloaders.scm (u-boot): Update to 2018.09.
  (u-boot-tools): Substitute "coverage" for "python-coverage".
  (u-boot-tools): Update workaround for only 99% test coverage.
---
 gnu/packages/bootloaders.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 4ba9d2e04..e6876d359 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -360,7 +360,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
 (define u-boot
   (package
     (name "u-boot")
-    (version "2018.07")
+    (version "2018.09")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -368,7 +368,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
                     "u-boot-" version ".tar.bz2"))
               (sha256
                (base32
-                "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z"))))
+                "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3"))))
     (native-inputs
      `(("bc" ,bc)
        ("bison" ,bison)
@@ -403,6 +403,12 @@ also initializes the boards (RAM etc).")
               (("/bin/false") (which "false")))
              (substitute* "tools/dtoc/fdt_util.py"
               (("'cc'") "'gcc'"))
+             (substitute* "tools/patman/test_util.py"
+              ;; python-coverage is simply called coverage in guix.
+              (("python-coverage") "coverage")
+              ;; Allow for only 99% test coverage.
+              ;; TODO: Find out why that is needed.
+              (("if coverage != '100%':") "if not int(coverage.rstrip('%')) >= 99:"))
              (substitute* "test/run"
               ;; Make it easier to find test failures.
               (("#!/bin/bash") "#!/bin/bash -x")
@@ -417,8 +423,6 @@ also initializes the boards (RAM etc).")
               (("def test_ctrl_c")
                "@pytest.mark.skip(reason='Guix has problems with SIGINT')
 def test_ctrl_c"))
-             (substitute* "tools/binman/binman.py"
-              (("100%") "99%")) ; TODO: Find out why that is needed.
              #t))
          (replace 'configure
            (lambda* (#:key make-flags #:allow-other-keys)
-- 
2.19.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#32982] [PATCH] gnu: u-boot: Update to 2018.09.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 2686 bytes --]

On Sun, Oct 07, 2018 at 08:16:47PM -0700, Vagrant Cascadian wrote:
> * gnu/packages/bootloaders.scm (u-boot): Update to 2018.09.
>   (u-boot-tools): Substitute "coverage" for "python-coverage".
>   (u-boot-tools): Update workaround for only 99% test coverage.

Thanks!

>  (define u-boot
>    (package
>      (name "u-boot")
> -    (version "2018.07")
> +    (version "2018.09")

For me, u-boot 2018.09 fails to build like this:

------
$ ./pre-inst-env guix build -e '(@@ (gnu packages bootloaders) u-boot)'
[...]
starting phase `configure'
source directory: "/tmp/guix-build-u-boot-2018.09.drv-0/u-boot-2018.09" (relative from build: ".")
build directory: "/tmp/guix-build-u-boot-2018.09.drv-0/u-boot-2018.09"
configure flags: ("CONFIG_SHELL=/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash" "SHELL=/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash" "--prefix=/gnu/store/c7smjwgl5xdmgcwgr1zf2clg97mln2kl-u-boot-2018.09" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu")
/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash: ./configure: No such file or directory
Backtrace:
           4 (primitive-load "/gnu/store/z4953ip3kra5rz7abqxn98w66in…")
In ice-9/eval.scm:
   191:35  3 (_ _)
In srfi/srfi-1.scm:
    640:9  2 (for-each #<procedure 95aee0 at /gnu/store/f95ghy8mx00…> …)
In /gnu/store/f95ghy8mx00fc22nrvswvnpqlfdkf2nk-module-import/guix/build/gnu-build-system.scm:
   799:31  1 (_ _)
In /gnu/store/f95ghy8mx00fc22nrvswvnpqlfdkf2nk-module-import/guix/build/utils.scm:
    616:6  0 (invoke _ . _)

/gnu/store/f95ghy8mx00fc22nrvswvnpqlfdkf2nk-module-import/guix/build/utils.scm:616:6: In procedure invoke:
Throw to key `srfi-34' with args `(#<condition &invoke-error [program: "/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash" arguments: ("./configure" "CONFIG_SHELL=/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash" "SHELL=/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19/bin/bash" "--prefix=/gnu/store/c7smjwgl5xdmgcwgr1zf2clg97mln2kl-u-boot-2018.09" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu") exit-status: 127 term-signal: #f stop-signal: #f] 68fd40>)'.
builder for `/gnu/store/azfpx7n5ds8lwg6jnpwnfgd018d3wc0d-u-boot-2018.09.drv' failed with exit code 1
build of /gnu/store/azfpx7n5ds8lwg6jnpwnfgd018d3wc0d-u-boot-2018.09.drv failed
View build log at '/var/log/guix/drvs/az/fpx7n5ds8lwg6jnpwnfgd018d3wc0d-u-boot-2018.09.drv.bz2'.
guix build: error: build failed: build of `/gnu/store/azfpx7n5ds8lwg6jnpwnfgd018d3wc0d-u-boot-2018.09.drv' failed
------

Is that expected?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#32982] [PATCH] gnu: u-boot: Update to 2018.09.

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

On 2018-10-11, Leo Famulari wrote:
> On Sun, Oct 07, 2018 at 08:16:47PM -0700, Vagrant Cascadian wrote:
>> * gnu/packages/bootloaders.scm (u-boot): Update to 2018.09.
>>   (u-boot-tools): Substitute "coverage" for "python-coverage".
>>   (u-boot-tools): Update workaround for only 99% test coverage.
>
> Thanks!
>
>>  (define u-boot
>>    (package
>>      (name "u-boot")
>> -    (version "2018.07")
>> +    (version "2018.09")
>
> For me, u-boot 2018.09 fails to build like this:
>
> ------
> $ ./pre-inst-env guix build -e '(@@ (gnu packages bootloaders) u-boot)'
> [...]
> starting phase `configure'
> source directory: "/tmp/guix-build-u-boot-2018.09.drv-0/u-boot-2018.09" (relative from build: ".")

I think u-boot itself is not a buildable package; there are numerous
packages that inherit from u-boot, such as u-boot-tools,
u-boot-wandboard, u-boot-novena, u-boot-cubieboard, etc.

Since each u-boot build is specific to a given target, I'm not sure what
a meaningful build of u-boot would be.


live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

bug#32982: [PATCH] gnu: u-boot: Update to 2018.09.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

On Thu, Oct 11, 2018 at 01:57:21PM -0700, Vagrant Cascadian wrote:
> I think u-boot itself is not a buildable package; there are numerous
> packages that inherit from u-boot, such as u-boot-tools,
> u-boot-wandboard, u-boot-novena, u-boot-cubieboard, etc.
> 
> Since each u-boot build is specific to a given target, I'm not sure what
> a meaningful build of u-boot would be.

Thanks for the explanation. Pushed as
e1d1ec143569d35eb3e222e6f49d1db0e5423be9

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]