[PATCH 1/2] gnu: hurd: Add hurd-source-url procedure.

[PATCH 1/2] gnu: hurd: Add hurd-source-url procedure.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* gnu/packages/hurd.scm (hurd-source-url): New procedure.
  (hurd-headers)[source]: Adjust accordingly.
---
 gnu/packages/hurd.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index b5da4cb96..12fce5453 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -39,6 +39,10 @@
   (string-append "mirror://gnu/gnumach/gnumach-"
                  version ".tar.gz"))
 
+(define (hurd-source-url version)
+  (string-append "mirror://gnu/hurd/hurd-"
+                 version ".tar.gz"))
+
 (define-public gnumach-headers
   (package
     (name "gnumach-headers")
@@ -113,8 +117,7 @@ communication.")
     (version "0.9")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnu/hurd/hurd-"
-                                  version ".tar.gz"))
+              (uri (hurd-source-url version))
               (sha256
                (base32
                 "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw"))))
-- 
2.12.1

[PATCH 2/2] gnu: Add the Hurd.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* gnu/packages/hurd.scm (hurd): New variable.
* gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/hurd.scm                              | 43 ++++++++++++++++++++++
 .../hurd-fix-eth-multiplexer-dependency.patch      | 26 +++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5da359037..81beea4ba 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -650,6 +650,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/higan-remove-march-native-flag.patch	\
   %D%/packages/patches/hop-linker-flags.patch			\
   %D%/packages/patches/hubbub-sort-entities.patch		\
+  %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch		\
   %D%/packages/patches/hypre-doc-tables.patch			\
   %D%/packages/patches/hypre-ldflags.patch			\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 12fce5453..e3f50ee06 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -245,3 +245,46 @@ Hurd-minimal package which are needed for both glibc and GCC.")
     (description
      "GNU Mach is the microkernel upon which a GNU Hurd system is based.")
     (license gpl2+)))
+
+(define-public hurd
+  (package
+    (name "hurd")
+    (version "0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (hurd-source-url version))
+              (sha256
+               (base32
+                "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw"))
+              (patches (search-patches "hurd-fix-eth-multiplexer-dependency.patch"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'pre-build
+                     (lambda _
+                       ;; Don't change the ownership of any file at this time.
+                       (substitute* "daemons/Makefile"
+                         (("-o root -m 4755") ""))
+                       (substitute* "utils/Makefile"
+                         (("-o root -m 4755") ""))
+                       #t)))
+       #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
+                                              %output "/lib")
+                          "--disable-ncursesw"
+                          "--without-libbz2"
+                          "--without-libz"
+                          "--without-parted")))
+    (build-system gnu-build-system)
+    (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers)))
+    (native-inputs
+     `(("mig" ,mig)
+       ("perl" ,perl)))
+    (supported-systems %hurd-systems)
+    (home-page "https://www.gnu.org/software/hurd/hurd.html")
+    (synopsis "The kernel servers for the GNU operating system")
+    (description
+     "The Hurd is the kernel for the GNU system, a replacement and
+augmentation of standard Unix kernels.  It is a collection of protocols for
+system interaction (file systems, networks, authentication), and servers
+implementing them.")
+    (license gpl2+)))
diff --git a/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch b/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch
new file mode 100644
index 000000000..4a4b9c634
--- /dev/null
+++ b/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch
@@ -0,0 +1,26 @@
+From def663310ba75c46a6345983e9480abc425b1c94 Mon Sep 17 00:00:00 2001
+From: Manolis Ragkousis <manolis837@gmail.com>
+Date: Sat, 8 Apr 2017 16:25:14 +0300
+Subject: [PATCH] eth-multiplexer: Fix iohelp missing dependency.
+
+* eth-multiplexer/Makefile (HURDLIBS): Add iohelp.
+---
+ eth-multiplexer/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eth-multiplexer/Makefile b/eth-multiplexer/Makefile
+index 07f909e7..cefa0abd 100644
+--- a/eth-multiplexer/Makefile
++++ b/eth-multiplexer/Makefile
+@@ -26,7 +26,7 @@ MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
+ device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
+ OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
+ LCLHDRS = ethernet.h util.h vdev.h netfs_impl.h
+-HURDLIBS = ports ihash fshelp shouldbeinlibc netfs bpf
++HURDLIBS = ports ihash iohelp fshelp shouldbeinlibc netfs bpf
+ LDLIBS = -lpthread
+ 
+ CFLAGS += -I$(top_srcdir)/libbpf
+-- 
+2.12.1
+
-- 
2.12.1

Re: [PATCH 2/2] gnu: Add the Hurd.

[Efraim Flashner]

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

On Sat, Apr 08, 2017 at 05:06:57PM +0300, manolis837@gmail.com wrote:
> From: Manolis Ragkousis <manolis837@gmail.com>
> 
> +       (modify-phases %standard-phases
> +         (add-before 'build 'pre-build
> +                     (lambda _
> +                       ;; Don't change the ownership of any file at this time.
> +                       (substitute* "daemons/Makefile"
> +                         (("-o root -m 4755") ""))
> +                       (substitute* "utils/Makefile"
> +                         (("-o root -m 4755") ""))
> +                       #t)))

These substitute* lines could be written as:
(substitute* '("daemons/Makefile" "utils/Makefile")
  (("-o root -m 4775") ""))

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] gnu: Add the Hurd.

[Manolis Ragkousis]

Hello Efraim,

On 04/09/17 05:41, Efraim Flashner wrote:
> On Sat, Apr 08, 2017 at 05:06:57PM +0300, manolis837@gmail.com wrote:
>> From: Manolis Ragkousis <manolis837@gmail.com>
>>
>> +       (modify-phases %standard-phases
>> +         (add-before 'build 'pre-build
>> +                     (lambda _
>> +                       ;; Don't change the ownership of any file at this time.
>> +                       (substitute* "daemons/Makefile"
>> +                         (("-o root -m 4755") ""))
>> +                       (substitute* "utils/Makefile"
>> +                         (("-o root -m 4755") ""))
>> +                       #t)))
> 
> These substitute* lines could be written as:
> (substitute* '("daemons/Makefile" "utils/Makefile")
>   (("-o root -m 4775") ""))
> 

Yes you are right. I will fix it and push to master. :)

Manolis

Re: [PATCH 1/2] gnu: hurd: Add hurd-source-url procedure.

[Ludovic Courtès]

manolis837@gmail.com skribis:

> From: Manolis Ragkousis <manolis837@gmail.com>
>
> * gnu/packages/hurd.scm (hurd-source-url): New procedure.
>   (hurd-headers)[source]: Adjust accordingly.

LGTM!

Ludo'.

Re: [PATCH 2/2] gnu: Add the Hurd.

[Ludovic Courtès]

Hey!

manolis837@gmail.com skribis:

> From: Manolis Ragkousis <manolis837@gmail.com>
>
> * gnu/packages/hurd.scm (hurd): New variable.
> * gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

[...]

> +    (synopsis "The kernel servers for the GNU operating system")
> +    (description
> +     "The Hurd is the kernel for the GNU system, a replacement and
> +augmentation of standard Unix kernels.  It is a collection of protocols for
> +system interaction (file systems, networks, authentication), and servers
> +implementing them.")
> +    (license gpl2+)))

Should we add a ‘supported-systems’ field here?  I suppose it can only
be built natively on GNU/Hurd in practice.

> diff --git a/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch b/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch
> new file mode 100644
> index 000000000..4a4b9c634
> --- /dev/null
> +++ b/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch
> @@ -0,0 +1,26 @@
> +From def663310ba75c46a6345983e9480abc425b1c94 Mon Sep 17 00:00:00 2001
> +From: Manolis Ragkousis <manolis837@gmail.com>
> +Date: Sat, 8 Apr 2017 16:25:14 +0300
> +Subject: [PATCH] eth-multiplexer: Fix iohelp missing dependency.
> +
> +* eth-multiplexer/Makefile (HURDLIBS): Add iohelp.

Please add a link to the upstream commit or discussion.

OK with these changes, thank you!

Ludo’.