diff mbox series

[bug#63527,2/3] gnu: hurd: Add rumpkernel.

Message ID 48105ac954b73df35d9c0d1ff7ec398e26634d4b.1684177770.git.janneke@gnu.org
State New
Headers show
Series Initial attempt at rumpdisk support for the Hurd. | expand

Commit Message

Janneke Nieuwenhuizen May 15, 2023, 7:36 p.m. UTC 
* gnu/packages/hurd.scm (hurd)[inputs]: Add rumpkernel.
[arguments]: Rename `prepare-dde' phase to 'prepare-addons'.  Add "rumpdisk"
directory.
---
 gnu/packages/hurd.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index f834abcf43..fad529580d 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -356,7 +356,7 @@  (define-public hurd
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'prepare-dde
+         (add-after 'unpack 'prepare-addons
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              ;; First we import the things we want from dde.
              (for-each make-file-writable (find-files "."))
@@ -370,7 +370,10 @@  (define-public hurd
              ;; Makefile. libdde_linux26 is built later in its own phase.
              (substitute* "Makefile"
                (("libbpf ")
-                "libbpf libmachdevdde libddekit"))))
+                "libbpf libmachdevdde libddekit rumpdisk"))
+             (substitute* "rumpdisk/Makefile"
+               (("rumpdev_ahcisata" all)
+                (string-append all " rumpdev_ata")))))
          (add-after 'unpack 'find-tirpc
            (lambda* (#:key inputs #:allow-other-keys)
              (for-each (lambda (var)
@@ -541,7 +544,11 @@  (define-public hurd
                 ;; clnt_create
                 "ac_func_search_save_LIBS=-ltirpc"
                 "ac_cv_search_clnt_create=false"
-                "CFLAGS=-fcommon")))
+                "CFLAGS=-fcommon")
+       #:make-flags
+         (list (string-append "RUMPPATH="
+                              (assoc-ref %build-inputs "rumpkernel")
+                              "/lib"))))
     (build-system gnu-build-system)
     (inputs
      `(("libgcrypt" ,libgcrypt)                  ;for /hurd/random
@@ -557,7 +564,8 @@  (define-public hurd
        ("coreutils" ,coreutils)
        ("sed" ,sed)
        ("grep" ,grep)
-       ("util-linux" ,util-linux)))
+       ("util-linux" ,util-linux)
+       ("rumpkernel" ,rumpkernel)))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)