15/16: system: hurd: Add net-base and inetutils, and /etc/{services, protocols}.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit db047a482c150806301075a9b65fce2bf01fe8e8
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Wed Apr 8 17:39:30 2020 +0200

    system: hurd: Add net-base and inetutils, and /etc/{services,protocols}.
    
    This fixes
    
        In procedure getaddrinfo: Servname not supported for ai_socktype
    
    * gnu/system/hurd.scm (%base-packages/hurd): Add net-base, inetutils.
    (cross-hurd-image): Add /etc/{services,protocols} from net-base.
---
 gnu/system/hurd.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index b35a99c..322ac10 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -21,6 +21,7 @@
   #:use-module (guix profiles)
   #:use-module (guix utils)
   #:use-module (gnu bootloader grub)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages cross-base)
@@ -48,7 +49,8 @@
                       #:target target))
 
 (define %base-packages/hurd
-  (list hurd bash coreutils file findutils grep sed guile-3.0))
+  (list hurd bash coreutils file findutils grep sed guile-3.0
+        net-base inetutils))
 
 (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach))
   "Return a cross-built GNU/Hurd image."
@@ -158,7 +160,14 @@ fi\n"))
       (file "/etc/hostname" "guixygnu")
       (file "/etc/resolv.conf"
             "nameserver 10.0.2.3\n")
-
+      ("/etc/services" -> ,(file-append (with-parameters 
((%current-target-system
+                                                           "i586-pc-gnu"))
+                                          net-base)
+                                        "/etc/services"))
+      ("/etc/protocols" -> ,(file-append (with-parameters 
((%current-target-system
+                                                            "i586-pc-gnu"))
+                                           net-base)
+                                         "/etc/protocols"))
       ("/etc/motd" -> ,(file-append (with-parameters ((%current-target-system
                                                        "i586-pc-gnu"))
                                       hurd)