[PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Manolis Ragkousis]

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

Time to start merging wip-hurd to core-updates.  I built core updates
locally and I made sure it doesn't break anything.

Manolis

[-- Attachment #2: 0001-gnu-glibc-Rename-linux-headers-input-to-kernel-heade.patch --]
[-- Type: text/x-patch, Size: 2055 bytes --]

From 2eefef2dea7fa6c027bfe611cfd6bb3a9d17fd94 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 10 Apr 2016 21:20:51 +0300
Subject: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

* gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
  agnostic name for the kernel headers.
  [arguments]: Adjust accordingly.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
  [propagated-inputs]: Adjust accordingly.
---
 gnu/packages/base.scm         | 4 ++--
 gnu/packages/commencement.scm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e662827..c9a581d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -494,7 +494,7 @@ store.")
 
    ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
    ;; users should automatically pull Linux headers as well.
-   (propagated-inputs `(("linux-headers" ,linux-libre-headers)))
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))
 
    (outputs '("out" "debug"))
 
@@ -534,7 +534,7 @@ store.")
                            ,version)
 
             (string-append "--with-headers="
-                           (assoc-ref %build-inputs "linux-headers")
+                           (assoc-ref %build-inputs "kernel-headers")
                            "/include")
 
             ;; This is the default for most architectures as of GNU libc 2.21,
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6dfe5c9..2d4daa6 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -355,7 +355,7 @@
                                    "export CPATH\n"
                                    all "\n"))))
                ,phases)))))
-     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
+     (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0))))
      (native-inputs
       `(("texinfo" ,texinfo-boot0)
         ("perl" ,perl-boot0)))
-- 
2.8.0

Re: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From 2eefef2dea7fa6c027bfe611cfd6bb3a9d17fd94 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Sun, 10 Apr 2016 21:20:51 +0300
> Subject: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.
>
> * gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
>   agnostic name for the kernel headers.
>   [arguments]: Adjust accordingly.
> * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
>   [propagated-inputs]: Adjust accordingly.

I think we also need to update the occurrences of ‘"linux-headers"’ in
cross-base.scm and make-bootstrap.scm, no?

Thanks for working on it!

Ludo’.

Re: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Manolis Ragkousis]

Hey Ludo,

On 04/14/16 00:07, Ludovic Courtès wrote:
>> * gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
>>   agnostic name for the kernel headers.
>>   [arguments]: Adjust accordingly.
>> * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
>>   [propagated-inputs]: Adjust accordingly.
> 
> I think we also need to update the occurrences of ‘"linux-headers"’ in
> cross-base.scm and make-bootstrap.scm, no?


Well the occurrences of linux-headers in cross-base.scm and
make-bootstrap.scm are not linked to the linux-headers input in
base.scm. In both of those files the linux-headers input is replaced
locally.

I would prefer to change them in another patch containing some wip-hurd
specific changes as well. WDYT?

Manolis

Re: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> Hey Ludo,
>
> On 04/14/16 00:07, Ludovic Courtès wrote:
>>> * gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
>>>   agnostic name for the kernel headers.
>>>   [arguments]: Adjust accordingly.
>>> * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
>>>   [propagated-inputs]: Adjust accordingly.
>> 
>> I think we also need to update the occurrences of ‘"linux-headers"’ in
>> cross-base.scm and make-bootstrap.scm, no?
>
>
> Well the occurrences of linux-headers in cross-base.scm and
> make-bootstrap.scm are not linked to the linux-headers input in
> base.scm. In both of those files the linux-headers input is replaced
> locally.

Those in make-bootstrap.scm definitely relate to base.scm (when doing
“guix build bootstrap-tarballs”), and the ones in cross-base.scm are not
entirely unrelated I think.

So I would prefer a mass rename.  Then we can apply it to core-updates
and be done with it.  :-)

WDYT?

Ludo’.

Re: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Manolis Ragkousis]

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

On 04/19/2016 06:19 PM, Ludovic Courtès wrote:
> Those in make-bootstrap.scm definitely relate to base.scm (when doing
> “guix build bootstrap-tarballs”), and the ones in cross-base.scm are not
> entirely unrelated I think.
> 
> So I would prefer a mass rename.  Then we can apply it to core-updates
> and be done with it.  :-)
> 
> WDYT?

You are right, it's better to finish with this. Here is the updated
patch :-).

Manolis

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-glibc-Rename-linux-headers-input-to-kernel-heade.patch --]
[-- Type: text/x-patch; name="0001-gnu-glibc-Rename-linux-headers-input-to-kernel-heade.patch", Size: 6864 bytes --]

From c51c4fd6b489c07d8577952114d4dc77a2b20049 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 10 Apr 2016 21:20:51 +0300
Subject: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

* gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
  agnostic name for the kernel headers.
  [arguments]: Adjust accordingly.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
  [propagated-inputs]: Adjust accordingly.
* gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Adjust
  accordingly.
  (cross-gcc)[native-inputs]: Adjust accordingly.
* gnu/packages/make-bootstrap.scm (%glibc-stripped)[arguments]: Adjust
  accordingly.
  [inputs]: Adjust accordingly.
---
 gnu/packages/base.scm           |  4 ++--
 gnu/packages/commencement.scm   |  2 +-
 gnu/packages/cross-base.scm     | 24 ++++++++++++------------
 gnu/packages/make-bootstrap.scm |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 7a88447..9a7d0bf 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -483,7 +483,7 @@ store.")
 
    ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
    ;; users should automatically pull Linux headers as well.
-   (propagated-inputs `(("linux-headers" ,linux-libre-headers)))
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))
 
    (outputs '("out" "debug"))
 
@@ -523,7 +523,7 @@ store.")
                            ,version)
 
             (string-append "--with-headers="
-                           (assoc-ref %build-inputs "linux-headers")
+                           (assoc-ref %build-inputs "kernel-headers")
                            "/include")
 
             ;; This is the default for most architectures as of GNU libc 2.21,
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 0d9133f..3ff447b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -363,7 +363,7 @@
                                    "export CPATH\n"
                                    all "\n"))))
                ,phases)))))
-     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
+     (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0))))
      (native-inputs
       `(("texinfo" ,texinfo-boot0)
         ("perl" ,perl-boot0)))
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 8bd599c..95fc70f 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -166,18 +166,18 @@ may be either a libc package or #f.)"
               `(alist-cons-before
                 'configure 'set-cross-path
                 (lambda* (#:key inputs #:allow-other-keys)
-                  ;; Add the cross Linux headers to CROSS_CPATH, and remove them
+                  ;; Add the cross kernel headers to CROSS_CPATH, and remove them
                   ;; from CPATH.
                   (let ((libc  (assoc-ref inputs "libc"))
-                        (linux (assoc-ref inputs "xlinux-headers")))
+                        (kernel (assoc-ref inputs "xkernel-headers")))
                     (define (cross? x)
                       ;; Return #t if X is a cross-libc or cross Linux.
                       (or (string-prefix? libc x)
-                          (string-prefix? linux x)))
+                          (string-prefix? kernel x)))
 
                     (setenv "CROSS_CPATH"
                             (string-append libc "/include:"
-                                           linux "/include"))
+                                           kernel "/include"))
                     (setenv "CROSS_LIBRARY_PATH"
                             (string-append libc "/lib"))
 
@@ -250,9 +250,9 @@ GCC that does not target a libc; otherwise, target that libc."
                                (alist-delete "libc" %final-inputs))))
            (if libc
                `(("libc" ,libc)
-                 ("xlinux-headers"                ;the target headers
+                 ("xkernel-headers"                ;the target headers
                   ,@(assoc-ref (package-propagated-inputs libc)
-                               "linux-headers"))
+                               "kernel-headers"))
                  ,@inputs)
                inputs))))
 
@@ -314,17 +314,17 @@ XBINUTILS and the cross tool chain."
                ,flags))
        ((#:phases phases)
         `(alist-cons-before
-          'configure 'set-cross-linux-headers-path
+          'configure 'set-cross-kernel-headers-path
           (lambda* (#:key inputs #:allow-other-keys)
-            (let ((linux (assoc-ref inputs "linux-headers")))
+            (let ((kernel (assoc-ref inputs "kernel-headers")))
               (setenv "CROSS_CPATH"
-                      (string-append linux "/include"))
+                      (string-append kernel "/include"))
               #t))
           ,phases))))
 
-    ;; Shadow the native "linux-headers" because glibc's recipe expects the
-    ;; "linux-headers" input to point to the right thing.
-    (propagated-inputs `(("linux-headers" ,xlinux-headers)))
+    ;; Shadow the native "kernel-headers" because glibc's recipe expects the
+    ;; "kernel-headers" input to point to the right thing.
+    (propagated-inputs `(("kernel-headers" ,xlinux-headers)))
 
     ;; FIXME: 'static-bash' should really be an input, not a native input, but
     ;; to do that will require building an intermediate cross libc.
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b3c86db..5dbd75d 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -344,7 +344,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                   (libdir (string-append out "/lib"))
                   (incdir (string-append out "/include"))
                   (libc   (assoc-ref %build-inputs "libc"))
-                  (linux  (assoc-ref %build-inputs "linux-headers")))
+                  (linux  (assoc-ref %build-inputs "kernel-headers")))
              (mkdir-p libdir)
              (for-each (lambda (file)
                          (let ((target (string-append libdir "/"
@@ -379,7 +379,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                                 (parameterize ((%current-target-system #f))
                                   (cross-libc target)))
                                glibc)))
-                ("linux-headers" ,linux-libre-headers)))
+                ("kernel-headers" ,linux-libre-headers)))
 
       ;; Only one output.
       (outputs '("out")))))
-- 
2.8.0

Re: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From c51c4fd6b489c07d8577952114d4dc77a2b20049 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Sun, 10 Apr 2016 21:20:51 +0300
> Subject: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.
>
> * gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
>   agnostic name for the kernel headers.
>   [arguments]: Adjust accordingly.
> * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
>   [propagated-inputs]: Adjust accordingly.
> * gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Adjust
>   accordingly.
>   (cross-gcc)[native-inputs]: Adjust accordingly.
> * gnu/packages/make-bootstrap.scm (%glibc-stripped)[arguments]: Adjust
>   accordingly.
>   [inputs]: Adjust accordingly.

LGTM, OK for ‘core-updates’!

Thank you, and sorry for the looong delay!

Ludo’.