GNU bug report logs - #35963
[PATCH] gnu: cross-base: Allow non-default linux-headers.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#35963: closed ([PATCH] gnu: cross-base: Allow non-default
 linux-headers.)
Date: Wed, 29 May 2019 13:47:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Wed, 29 May 2019 15:45:57 +0200
with message-id <20190529154557.097df392 <at> scratchpost.org>
and subject line Re: [bug#35963] [PATCH] gnu: cross-base: Allow non-default linux-headers.
has caused the debbugs.gnu.org bug report #35963,
regarding [PATCH] gnu: cross-base: Allow non-default linux-headers.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
35963: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=35963
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Carl Dong <contact <at> carldong.me>
To: guix-patches <at> gnu.org
Cc: Carl Dong <contact <at> carldong.me>
Subject: [PATCH] gnu: cross-base: Allow non-default linux-headers.
Date: Tue, 28 May 2019 15:57:41 +0000

* gnu/packages/cross-base.scm (cross-kernel-headers): Add
  'linux-headers' optional argument to specify using a non-default
  linux-kernel package.
---
 gnu/packages/cross-base.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index b3b90a6490..a0341ebc5d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -39,7 +39,8 @@
   #:export (cross-binutils
             cross-libc
             cross-gcc
-            cross-newlib?))
+            cross-newlib?
+            cross-kernel-headers))
 
 (define-syntax %xgcc
   ;; GCC package used as the basis for cross-compilation.  It doesn't have to
@@ -276,18 +277,19 @@ target that libc."
 
 (define* (cross-kernel-headers target
                                #:optional
+                               (linux-headers linux-libre-headers)
                                (xgcc (cross-gcc target))
                                (xbinutils (cross-binutils target)))
   "Return headers depending on TARGET."
 
   (define xlinux-headers
-    (package (inherit linux-libre-headers)
-      (name (string-append (package-name linux-libre-headers)
+    (package (inherit linux-headers)
+      (name (string-append (package-name linux-headers)
                            "-cross-" target))
       (arguments
        (substitute-keyword-arguments
            `(#:implicit-cross-inputs? #f
-             ,@(package-arguments linux-libre-headers))
+             ,@(package-arguments linux-headers))
          ((#:phases phases)
           `(alist-replace
             'build
@@ -300,7 +302,7 @@ target that libc."
             ,phases))))
       (native-inputs `(("cross-gcc" ,xgcc)
                        ("cross-binutils" ,xbinutils)
-                       ,@(package-native-inputs linux-libre-headers)))))
+                       ,@(package-native-inputs linux-headers)))))
 
   (define xgnumach-headers
     (package (inherit gnumach-headers)
-- 
2.21.0

[Message part 3 (message/rfc822, inline)]

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Carl Dong <contact <at> carldong.me>
Cc: 35963-done <at> debbugs.gnu.org
Subject: Re: [bug#35963] [PATCH] gnu: cross-base: Allow non-default
 linux-headers.
Date: Wed, 29 May 2019 15:45:57 +0200

[Message part 4 (text/plain, inline)]

Thanks!

Pushed to guix master as commit 2ea77d48a739eb289f2472d2c30c37a30bbcb571.

[Message part 5 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.