Patchwork gnu: Simplify dtc package definition.

login
register
mail settings
Submitter Danny Milosavljevic
Date Sept. 7, 2016, 7:46 a.m.
Message ID <20160907074631.3771-1-dannym@scratchpost.org>
Download mbox | patch
Permalink /patch/15369/
State New
Headers show

Comments

Danny Milosavljevic - Sept. 7, 2016, 7:46 a.m.
---
 gnu/packages/u-boot.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
David Craven - Sept. 7, 2016, 8:15 a.m.
LGTM. Are these changes part of the debian patchset?
Danny Milosavljevic - Sept. 7, 2016, 9:01 a.m.
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.
David Craven - Sept. 8, 2016, 3:09 p.m.
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?
Danny Milosavljevic - Sept. 8, 2016, 5:55 p.m.
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...
David Craven - Sept. 8, 2016, 6:45 p.m.
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?
Leo Famulari - Sept. 10, 2016, 6:19 p.m.
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.
David Craven - Sept. 10, 2016, 6:22 p.m.
> 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

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")