[PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Manolis Ragkousis]

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

Hello everyone,

This patch applies to wip-hurd.

Manolis

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

From f9759a80030e11dfb8257f2334d5ce8f5d009cc7 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 14 Aug 2015 14:00:16 +0300
Subject: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to
 "kernel-headers".

* gnu/packages/base.scm (glibc/linux)[propagated-inputs]: Rename to "kernel-headers".
  (glibc/hurd)[arguments]: Adjust accordingly.
---
 gnu/packages/base.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index bbc6554..b3d9efa 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -465,7 +465,8 @@ 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)))
+   ;; Use kernel-headers for consistency between the two glibcs.
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))
 
    (outputs '("out" "debug"))
 
@@ -501,7 +502,7 @@ store.")
             (string-append "libc_cv_localedir=/run/current-system/locale")
 
             (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,
@@ -657,14 +658,8 @@ with the Linux kernel.")
                        ;; Disable it.
                        "--disable-nscd")
                  (filter (lambda (flag)
-                           (not (or (string-prefix? "--with-headers=" flag)
-                                    (string-prefix? "--enable-kernel=" flag))))
-                         ;; Evaluate 'original-configure-flags' in a
-                         ;; lexical environment that has a dummy
-                         ;; "linux-headers" input, to prevent errors.
-                         (let ((%build-inputs `(("linux-headers" . "@DUMMY@")
-                                                ,@%build-inputs)))
-                           ,original-configure-flags))))))))
+                           (not (string-prefix? "--enable-kernel=" flag)))
+                         ,original-configure-flags)))))))
 
 (define* (glibc-for-target #:optional
                            (target (or (%current-target-system)
-- 
2.5.0

Re: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Manolis Ragkousis]

Can I push this to wip-hurd?

Re: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From f9759a80030e11dfb8257f2334d5ce8f5d009cc7 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Fri, 14 Aug 2015 14:00:16 +0300
> Subject: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to
>  "kernel-headers".

The subject should be more:

  gnu: glibc/linux: Change label from "linux-headers" to "kernel-headers".

because the package name itself is unchanged.

> * gnu/packages/base.scm (glibc/linux)[propagated-inputs]: Rename to "kernel-headers".
>   (glibc/hurd)[arguments]: Adjust accordingly.

A grep for ‘"linux-headers"’ in master shows that there are 4 files
matching.  These probably need to be updated as well?

Also, could we make this change on top of current master and apply it to
‘core-updates’?  I suppose that means ‘wip-hurd’ would need to be
rebased and adjusted, but despite this annoyance, that would probably
facilitate merging.

WDYT?

Thanks,
Ludo’.

Re: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Manolis Ragkousis]

Ok, will do.

Manolis

Re: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Manolis Ragkousis]

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

Updated all the files referring to linux-headers in gnu/packages. The
part of the patch referring to
glibc/hurd was kept out, as there is no glibc/hurd in master.

Is it okay to push it to core-updates?

[-- Attachment #2: 0001-gnu-packages-Change-label-from-linux-headers-to-kern.patch --]
[-- Type: text/x-patch, Size: 5052 bytes --]

From b5d724cae502e8bf664b71045f4053e6d35a98df Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Mon, 7 Sep 2015 14:01:51 +0300
Subject: [PATCH] gnu: packages: Change label from "linux-headers" to
 "kernel-headers".

* gnu/packages/base.scm (glibc)[propagated-inputs, arguments]: Change to "kernel-headers".
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[propagated-inputs]: Same
* gnu/packages/cross-base.scm (cross-gcc)[native-inputs]: Same.
  (cross-libc)[propagated-inputs, arguments]: Same.
* gnu/packages/make-bootstrap.scm (%glibc-stripped)[inputs, arguments]: Same.
---
 gnu/packages/base.scm           | 4 ++--
 gnu/packages/commencement.scm   | 2 +-
 gnu/packages/cross-base.scm     | 6 +++---
 gnu/packages/make-bootstrap.scm | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f35f619..79f9b60 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -459,7 +459,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"))
 
@@ -495,7 +495,7 @@ store.")
             (string-append "libc_cv_localedir=/run/current-system/locale")
 
             (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 74c3f30..d336318 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -334,7 +334,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 d64cdd1..fc3cea1 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -247,7 +247,7 @@ 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"))
                  ,@inputs)
@@ -313,7 +313,7 @@ XBINUTILS and the cross tool chain."
         `(alist-cons-before
           'configure 'set-cross-linux-headers-path
           (lambda* (#:key inputs #:allow-other-keys)
-            (let ((linux (assoc-ref inputs "linux-headers")))
+            (let ((linux (assoc-ref inputs "kernel-headers")))
               (setenv "CROSS_CPATH"
                       (string-append linux "/include"))
               #t))
@@ -321,7 +321,7 @@ XBINUTILS and the cross tool chain."
 
     ;; 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)))
+    (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 1b70d54..6b1b4ef 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -346,7 +346,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 "/"
@@ -381,7 +381,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.5.0

Re: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> Updated all the files referring to linux-headers in gnu/packages. The
> part of the patch referring to
> glibc/hurd was kept out, as there is no glibc/hurd in master.
>
> Is it okay to push it to core-updates?

Sorry, because of delay on my side, this will have to go to ‘wip-hurd’.
We can merge it in the next ‘core-updates’ though (hopefully we can
close and reopen ‘core-updates’ in a few days.)

> From b5d724cae502e8bf664b71045f4053e6d35a98df Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Mon, 7 Sep 2015 14:01:51 +0300
> Subject: [PATCH] gnu: packages: Change label from "linux-headers" to
>  "kernel-headers".
>
> * gnu/packages/base.scm (glibc)[propagated-inputs, arguments]: Change to "kernel-headers".
> * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[propagated-inputs]: Same
> * gnu/packages/cross-base.scm (cross-gcc)[native-inputs]: Same.
>   (cross-libc)[propagated-inputs, arguments]: Same.
> * gnu/packages/make-bootstrap.scm (%glibc-stripped)[inputs, arguments]: Same.

LGTM.

Thanks!

Ludo’.