Patchwork gnu: Update sunxi-tools to 1.4

login
register
mail settings
Submitter Danny Milosavljevic
Date Oct. 26, 2016, 9:21 p.m.
Message ID <20161026212132.11164-1-dannym@scratchpost.org>
Download mbox | patch
Permalink /patch/16850/
State New
Headers show

Comments

Danny Milosavljevic - Oct. 26, 2016, 9:21 p.m.
---
 gnu/packages/admin.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
John Darrington - Oct. 27, 2016, 5:22 a.m.
On Wed, Oct 26, 2016 at 11:21:32PM +0200, Danny Milosavljevic wrote:
     ---
      gnu/packages/admin.scm | 14 +++++++++-----
      1 file changed, 9 insertions(+), 5 deletions(-)
     
     diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
     index d9b08ef..856d946 100644
     --- a/gnu/packages/admin.scm
     +++ b/gnu/packages/admin.scm
     @@ -1892,7 +1893,7 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
                     ;; Upstream adds Makefile and config.h as dependencies
                     ;; of all their tools which means $^ would pass them to gcc.
                     ;; gcc won't know what to do with a Makefile.
     -               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
     +               (("-o [$][@] [$]\\^") "-o $@ $<"))
                   #t))
               (delete 'configure))))
          (home-page "https://github.com/linux-sunxi/sunxi-tools")

It looks to me like this change should go into a patch and be submitted upstream.

J'
Efraim Flashner - Oct. 27, 2016, 6:27 a.m.
On Wed, Oct 26, 2016 at 11:21:32PM +0200, Danny Milosavljevic wrote:
> ---
>  gnu/packages/admin.scm | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index d9b08ef..856d946 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1859,14 +1859,14 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
>  (define-public sunxi-tools
>    (package
>      (name "sunxi-tools")
> -    (version "1.3")
> +    (version "1.4")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append "https://github.com/linux-sunxi/"
>                             "sunxi-tools/archive/v" version ".tar.gz"))
>         (sha256
> -        (base32 "1iazm28gws1i8sls3gxwc5p108n56ags287zmh1rpvkn2k1az81a"))
> +        (base32 "1hx72cx4wj9w4c6niq0b6l3c5aj259g392z6y3a5f7fnybanq3pq"))
>         (modules '((guix build utils)))
>         (snippet
>          ;; Remove binaries contained in the tarball which are only for the
> @@ -1882,8 +1882,9 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
>       `(#:tests? #f ; no tests exist
>         #:make-flags (list (string-append "PREFIX="
>                                           (assoc-ref %outputs "out"))
> -                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo"
> -                          "CROSS_COMPILE=")
> +                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo sunxi-script_extractor"
> +                          "CROSS_COMPILE="
> +                          "CC=gcc")

is the change in 'target-tools' necessary for the update or should/can
it be split out into a second commit?

>         #:phases
>         (modify-phases %standard-phases
>           (add-after 'unpack 'fix-Makefile
> @@ -1892,7 +1893,7 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
>                 ;; Upstream adds Makefile and config.h as dependencies
>                 ;; of all their tools which means $^ would pass them to gcc.
>                 ;; gcc won't know what to do with a Makefile.
> -               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
> +               (("-o [$][@] [$]\\^") "-o $@ $<"))
>               #t))
>           (delete 'configure))))
>      (home-page "https://github.com/linux-sunxi/sunxi-tools")
> @@ -1910,5 +1911,8 @@ bootloader) parameters.
>  @item @command{sunxi-pio}: Sets GPIO parameters and oscillates a GPIO
>  in order to be able to find it.
>  @item @command{sunxi-meminfo}: Prints memory bus settings.
> +@item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
> +@item @command{sunxi-script_extractor}: Extracts script.bin from a
> +running Linux 3.4 kernel.
>  @end enumerate")
>      (license license:gpl2+)))
>
Danny Milosavljevic - Oct. 27, 2016, 12:28 p.m.
> is the change in 'target-tools' necessary for the update or should/can
> it be split out into a second commit?

It should be split out...
Danny Milosavljevic - Oct. 27, 2016, 12:30 p.m.
>      -               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
>      +               (("-o [$][@] [$]\\^") "-o $@ $<"))
>                    #t))
>                (delete 'configure))))
>           (home-page "https://github.com/linux-sunxi/sunxi-tools")
> 
> It looks to me like this change should go into a patch and be submitted upstream.

Yes, there's an upstream issue open for it: <https://github.com/linux-sunxi/sunxi-tools/issues/70>.

I've also reported a seperate issue for an executable that doesn't get installed: <https://github.com/linux-sunxi/sunxi-tools/issues/69>.
Ricardo Wurmus - Oct. 27, 2016, 2:02 p.m.
Danny Milosavljevic <dannym@scratchpost.org> writes:

>>      -               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
>>      +               (("-o [$][@] [$]\\^") "-o $@ $<"))
>>                    #t))
>>                (delete 'configure))))
>>           (home-page "https://github.com/linux-sunxi/sunxi-tools")
>> 
>> It looks to me like this change should go into a patch and be submitted upstream.
>
> Yes, there's an upstream issue open for it: <https://github.com/linux-sunxi/sunxi-tools/issues/70>.
>
> I've also reported a seperate issue for an executable that doesn't get installed: <https://github.com/linux-sunxi/sunxi-tools/issues/69>.

In this case please add a comment referencing the issue.
Thanks!

~~ Ricardo

Patch

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d9b08ef..856d946 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1859,14 +1859,14 @@  Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
 (define-public sunxi-tools
   (package
     (name "sunxi-tools")
-    (version "1.3")
+    (version "1.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/linux-sunxi/"
                            "sunxi-tools/archive/v" version ".tar.gz"))
        (sha256
-        (base32 "1iazm28gws1i8sls3gxwc5p108n56ags287zmh1rpvkn2k1az81a"))
+        (base32 "1hx72cx4wj9w4c6niq0b6l3c5aj259g392z6y3a5f7fnybanq3pq"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove binaries contained in the tarball which are only for the
@@ -1882,8 +1882,9 @@  Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
      `(#:tests? #f ; no tests exist
        #:make-flags (list (string-append "PREFIX="
                                          (assoc-ref %outputs "out"))
-                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo"
-                          "CROSS_COMPILE=")
+                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo sunxi-script_extractor"
+                          "CROSS_COMPILE="
+                          "CC=gcc")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-Makefile
@@ -1892,7 +1893,7 @@  Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
                ;; Upstream adds Makefile and config.h as dependencies
                ;; of all their tools which means $^ would pass them to gcc.
                ;; gcc won't know what to do with a Makefile.
-               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
+               (("-o [$][@] [$]\\^") "-o $@ $<"))
              #t))
          (delete 'configure))))
     (home-page "https://github.com/linux-sunxi/sunxi-tools")
@@ -1910,5 +1911,8 @@  bootloader) parameters.
 @item @command{sunxi-pio}: Sets GPIO parameters and oscillates a GPIO
 in order to be able to find it.
 @item @command{sunxi-meminfo}: Prints memory bus settings.
+@item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
+@item @command{sunxi-script_extractor}: Extracts script.bin from a
+running Linux 3.4 kernel.
 @end enumerate")
     (license license:gpl2+)))