[PATCH] gnu: Simplify dtc package definition.

[PATCH] gnu: Simplify dtc package definition.

[Danny Milosavljevic]

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

---
 gnu/packages/u-boot.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Simplify-dtc-package-definition.patch --]
[-- Type: text/x-patch; name="0001-gnu-Simplify-dtc-package-definition.patch", Size: 887 bytes --]

diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm
index e9a4b90..7949d8a 100644
--- a/gnu/packages/u-boot.scm
+++ b/gnu/packages/u-boot.scm
@@ -47,15 +47,11 @@
        ("flex" ,flex)))
     (arguments
      `(#:make-flags
-       (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             "INSTALL=install")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-paths
-           (lambda _
-             (substitute* "Makefile"
-               (("/usr/bin/install") "install"))
-             (substitute* "Makefile"
-               (("PREFIX = \\$\\(HOME\\)") ""))))
          (delete 'configure))))
     (home-page "https://www.devicetree.org")
     (synopsis "Compiles device tree source files")

Re: [PATCH] gnu: Simplify dtc package definition.

[David Craven]

LGTM. Are these changes part of the debian patchset?

Re: [PATCH] gnu: Simplify dtc package definition.

[Danny Milosavljevic]

Hi David,

On Wed, 7 Sep 2016 10:15:29 +0200
David Craven <david@craven.ch> wrote:

> LGTM. Are these changes part of the debian patchset?

No, I found out that GNU make allows you to override variables used inside Makefiles from make's command line.

To test:

write a Makefile containing:

#-----
PREFIX = /foo

all:
	echo $(PREFIX)
#-----

Then try

$ make PREFIX=/bar

.

It will override the variable.

Re: [PATCH] gnu: Simplify dtc package definition.

[David Craven]

Why aren't you using git format-patch? :)

git format-patch -1
git send-email *.patch --to guix-devel@gnu.org

is what I do...

From what I can tell you are doing git diff > file.patch?

Re: [PATCH] gnu: Simplify dtc package definition.

[Danny Milosavljevic]

Hi David,

On Thu, 8 Sep 2016 17:09:12 +0200
David Craven <david@craven.ch> wrote:

> Why aren't you using git format-patch? :)
> 
> git format-patch -1
> git send-email *.patch --to guix-devel@gnu.org
> 
> is what I do...

That's exactly what I do too - the exact same commands. I don't know what magical options other people use but that's how it always comes out for me. I usually manually copy&paste the subject back down into the body - but this time I forgot. Regardless, that was a bona fide git format-patch AND git send-email E-Mail.

On the other hand, Linux people also told me about my git format-patch settings being "wrong" - and indeed they are different than the ones I use to submit to Guix.

What are the settings you use / we should use?

Mine are:
 
$ git config --global -l |grep ^format
format.subjectprefix=FIXME
format.numbered=auto
format.signoff=false
format.coverletter=auto
format.signature=
format.attach=

And the git-format-patch executable is built from GuixSD svn master hydra from a few days ago...

Re: [PATCH] gnu: Simplify dtc package definition.

[David Craven]

Hi Danny,

I don't have any special settings configured, just the default.

Your patches are missing a header like this one:

From fc0e6e2ae96b0586035de96c65cfd08186ceb28a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 7 Sep 2016 21:02:28 +0300
Subject: [PATCH] gnu: lightweight-desktop.tmpl: Fix typo.

* gnu/system/examples/lightweight-desktop.tmpl: While it is currently
unknown if Bob has a brother, it is sufficiently documented that Alice
is, in fact, Bob's sister.
---
 gnu/system/examples/lightweight-desktop.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does `git format-patch -1 && git checkout HEAD~ && git am *.patch` work for you?

Re: [PATCH] gnu: Simplify dtc package definition.

[Danny Milosavljevic]

Hi,

I think that's because I set it up to use attachments (Luda asked me to).

The E-Mail, raw as git send-email sent it, looks like this:

From 7e7c30119aebab0ee48c4e55d8c7471f0fde487c Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 7 Sep 2016 09:44:55 +0200
Subject: [PATCH] gnu: Simplify dtc package definition.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------2.9.1"

This is a multi-part message in MIME format.
--------------2.9.1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 gnu/packages/u-boot.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


--------------2.9.1
Content-Type: text/x-patch; name="0001-gnu-Simplify-dtc-package-definition.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-gnu-Simplify-dtc-package-definition.patch"

diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm
index e9a4b90..7949d8a 100644
--- a/gnu/packages/u-boot.scm
+++ b/gnu/packages/u-boot.scm
@@ -47,15 +47,11 @@
        ("flex" ,flex)))
     (arguments
      `(#:make-flags
-       (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             "INSTALL=install")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-paths
-           (lambda _
-             (substitute* "Makefile"
-               (("/usr/bin/install") "install"))
-             (substitute* "Makefile"
-               (("PREFIX = \\$\\(HOME\\)") ""))))
          (delete 'configure))))
     (home-page "https://www.devicetree.org")
     (synopsis "Compiles device tree source files")

--------------2.9.1--

Note the MIME header.

I tried

$ git am ~/src/outgoing-dtc/0001-gnu-Simplify-dtc-package-definition.patch
Applying: gnu: Simplify dtc package definition.

So it seems to work.

Re: [PATCH] gnu: Simplify dtc package definition.

[David Craven]

Hi Danny,

So when there's an attachment I git am the attachment. Don't know if
that's how it's supposed to be done. The attachment starts at
--------------2.9.1, so it doesn't include the commit information.

Thanks for looking into this, hopefully we can move to gitlab soon =P
David

Re: [PATCH] gnu: Simplify dtc package definition.

[Leo Famulari]

On Thu, Sep 08, 2016 at 08:45:26PM +0200, David Craven wrote:
> Hi Danny,
> 
> I don't have any special settings configured, just the default.
> 
> Your patches are missing a header like this one:
> 
> From fc0e6e2ae96b0586035de96c65cfd08186ceb28a Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Wed, 7 Sep 2016 21:02:28 +0300
> Subject: [PATCH] gnu: lightweight-desktop.tmpl: Fix typo.

Danny's message was not missing the header. You should use `git am` to
apply the email itself.

Re: [PATCH] gnu: Simplify dtc package definition.

[David Craven]

> Danny's message was not missing the header. You should use `git am` to
> apply the email itself.

@leo
Ah, that explains it. Thanks!

@danny
sorry