[PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with kernel-headers package.

[PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with kernel-headers package.

[Manolis Ragkousis]

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



[-- Attachment #2: 0002-gnu-base-Replace-Gnumach-Hurd-headers-with-kernel-he.patch --]
[-- Type: text/x-patch, Size: 1059 bytes --]

From fcf937ba04e5d4daf13c80372c0973e2f7bbc784 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 31 Jul 2015 19:20:31 +0300
Subject: [PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with
 kernel-headers package.

* gnu/packages/base.scm (glibc/hurd): Replace with kernel-headers package.
---
 gnu/packages/base.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index b7e7947..237d27e 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -625,9 +625,7 @@ with the Linux kernel.")
 
     ;; Libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
     ;; so both should be propagated.
-    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
-                         ("hurd-headers" ,hurd-headers)
-                         ("hurd-minimal" ,hurd-minimal)))
+    (propagated-inputs `(("kernel-headers" ,kernel-headers)))
     (native-inputs
      `(,@(package-native-inputs glibc/linux)
        ("mig" ,mig)
-- 
2.4.6

Re: [PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with kernel-headers package.

[Manolis Ragkousis]

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

Updated patch

[-- Attachment #2: 0001-gnu-base-Replace-Gnumach-Hurd-headers-with-kernel-he.patch --]
[-- Type: text/x-patch, Size: 1065 bytes --]

From 66d633186cb338c87f7df9c6494f7dca1c8531c0 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 31 Jul 2015 19:20:31 +0300
Subject: [PATCH] gnu: base: Replace Gnumach/Hurd headers with kernel-headers
 package.

* gnu/packages/base.scm (glibc/hurd): Replace with kernel-headers package.
---
 gnu/packages/base.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 07a06c9..91a9b48 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -625,9 +625,7 @@ with the Linux kernel.")
 
     ;; Libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
     ;; so both should be propagated.
-    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
-                         ("hurd-headers" ,hurd-headers)
-                         ("hurd-minimal" ,hurd-minimal)))
+    (propagated-inputs `(("hurd-kernel-headers" ,hurd-kernel-headers)))
     (native-inputs
      `(,@(package-native-inputs glibc/linux)
        ("mig" ,mig)
-- 
2.5.0

Re: [PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with kernel-headers package.

[Mark H Weaver]

Manolis Ragkousis <manolis837@gmail.com> writes:

> From 66d633186cb338c87f7df9c6494f7dca1c8531c0 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Fri, 31 Jul 2015 19:20:31 +0300
> Subject: [PATCH] gnu: base: Replace Gnumach/Hurd headers with kernel-headers
>  package.

Okay for wip-hurd.

    Thanks!
      Mark

Re: [PATCH 2/3] gnu: base: Replace Gnumach/Hurd headers with kernel-headers package.

[Mark H Weaver]

Manolis Ragkousis <manolis837@gmail.com> writes:

> From 66d633186cb338c87f7df9c6494f7dca1c8531c0 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Fri, 31 Jul 2015 19:20:31 +0300
> Subject: [PATCH] gnu: base: Replace Gnumach/Hurd headers with kernel-headers
>  package.
>
> * gnu/packages/base.scm (glibc/hurd): Replace with kernel-headers package.

Sorry, I didn't look at the commit log before.  It should be something
like this:

--8<---------------cut here---------------start------------->8---
gnu: glibc/hurd: Use hurd-kernel-headers package.

* gnu/packages/base.scm (glibc/hurd)[propagated-inputs]: Replace with
  hurd-kernel-headers.
--8<---------------cut here---------------end--------------->8---

Okay to push to wip-hurd with these changes.

     Thanks!
       Mark