From b5d724cae502e8bf664b71045f4053e6d35a98df Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <address@hidden>
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