diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-11-02 15:46:52 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 08:33:12 +0100 |
| commit | ae2213ed989051a680cf76582b758fd748838688 (patch) | |
| tree | bfbab3271a4befd4c5e1761d79f4ddd9ccc0afca /gnu | |
| parent | a3cce93271a5396887b3232ec2cfcd2d28b2e5b5 (diff) | |
gnu: hurd: Update to 0.9.git20240714.
* gnu/packages/hurd.scm (hurd-headers): Update to 0.9.git20240714.
(hurd)[arguments]: Remove rumpdisk build hack from "prepare-addons" stage.
Instead, when cross-compiling, add stage "fixup-cross-configure" to enable
rumpdisk.
* gnu/system.scm (hurd-multiboot-modules): Remove
"--x-xattr-translator-records" option that has been removed and is now the
default.
Change-Id: I4609b5a959c1ece98e2fe1aedbb1d31d6edadcca
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/hurd.scm | 12 | ||||
| -rw-r--r-- | gnu/system.scm | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 28f39cc448a..06fae1bd3b6 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm | |||
| @@ -132,7 +132,7 @@ communication.") | |||
| 132 | 132 | ||
| 133 | (define-public hurd-headers | 133 | (define-public hurd-headers |
| 134 | (let ((revision "3") | 134 | (let ((revision "3") |
| 135 | (commit "v0.9.git20231217")) | 135 | (commit "v0.9.git20240714")) |
| 136 | (package | 136 | (package |
| 137 | (name "hurd-headers") | 137 | (name "hurd-headers") |
| 138 | (version (string-drop commit 1)) | 138 | (version (string-drop commit 1)) |
| @@ -143,7 +143,7 @@ communication.") | |||
| 143 | (commit commit))) | 143 | (commit commit))) |
| 144 | (sha256 | 144 | (sha256 |
| 145 | (base32 | 145 | (base32 |
| 146 | "1d138kzhil6s5gf9di8grpz1iziakyfv037wkc8s7qyd61imm31d")) | 146 | "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll")) |
| 147 | (file-name (git-file-name name version)))) | 147 | (file-name (git-file-name name version)))) |
| 148 | (build-system gnu-build-system) | 148 | (build-system gnu-build-system) |
| 149 | (native-inputs | 149 | (native-inputs |
| @@ -336,7 +336,7 @@ Hurd-minimal package which are needed for both glibc and GCC.") | |||
| 336 | ;; Makefile. libdde_linux26 is built later in its own phase. | 336 | ;; Makefile. libdde_linux26 is built later in its own phase. |
| 337 | (substitute* "Makefile" | 337 | (substitute* "Makefile" |
| 338 | (("libbpf ") | 338 | (("libbpf ") |
| 339 | "libbpf libmachdevdde libddekit rumpdisk")))) | 339 | "libbpf libmachdevdde libddekit ")))) |
| 340 | (add-after 'unpack 'find-tirpc | 340 | (add-after 'unpack 'find-tirpc |
| 341 | (lambda* (#:key inputs #:allow-other-keys) | 341 | (lambda* (#:key inputs #:allow-other-keys) |
| 342 | (for-each (lambda (var) | 342 | (for-each (lambda (var) |
| @@ -362,6 +362,12 @@ Hurd-minimal package which are needed for both glibc and GCC.") | |||
| 362 | (("#include <rpc/pmap_prot.h>" m) | 362 | (("#include <rpc/pmap_prot.h>" m) |
| 363 | (string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\n" m))) | 363 | (string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\n" m))) |
| 364 | #t)) | 364 | #t)) |
| 365 | ,@(if (%current-target-system) | ||
| 366 | '((add-after 'configure 'fixup-cross-configure | ||
| 367 | (lambda _ | ||
| 368 | (substitute* "config.make" | ||
| 369 | (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes"))))) | ||
| 370 | '()) | ||
| 365 | (add-before 'build 'pre-build | 371 | (add-before 'build 'pre-build |
| 366 | (lambda _ | 372 | (lambda _ |
| 367 | ;; Don't change the ownership of any file at this time. | 373 | ;; Don't change the ownership of any file at this time. |
diff --git a/gnu/system.scm b/gnu/system.scm index 074cd04a0ed..dfcb8fb2794 100644 --- a/gnu/system.scm +++ b/gnu/system.scm | |||
| @@ -1539,7 +1539,6 @@ a list of <menu-entry>, to populate the \"old entries\" menu." | |||
| 1539 | "--multiboot-command-line='${kernel-command-line}'" | 1539 | "--multiboot-command-line='${kernel-command-line}'" |
| 1540 | "--exec-server-task='${exec-task}'" | 1540 | "--exec-server-task='${exec-task}'" |
| 1541 | "--store-type=typed" | 1541 | "--store-type=typed" |
| 1542 | "--x-xattr-translator-records" | ||
| 1543 | "'${root}'" | 1542 | "'${root}'" |
| 1544 | "'$(fs-task=task-create)'")) | 1543 | "'$(fs-task=task-create)'")) |
| 1545 | (target (%current-target-system)) | 1544 | (target (%current-target-system)) |
