diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-01-06 12:05:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-01-07 17:44:12 +0100 |
| commit | 410a359d4ac696cb61682dd6cc903319ca295646 (patch) | |
| tree | ad956b9c57df3f58c15ea7ee18f8c277b5e84875 | |
| parent | d8b7259197aae7370cf7f72af74a6a0c0663737f (diff) | |
syscalls: Remove wrong syscall ID for ‘kexec_load_file’ on i686.
Fixes <https://issues.guix.gnu.org/75205>.
* guix/build/syscalls.scm (kexec-load-file): Remove syscall ID for i686.
* tests/syscalls.scm ("kexec-load-file"): Accept ENOSYS in addition to
EPERM.
Reported-by: Dariqq <dariqq@posteo.net>
Change-Id: I83fe25636addb57533ed88cbfb40107d265b13a7
| -rw-r--r-- | guix/build/syscalls.scm | 2 | ||||
| -rw-r--r-- | tests/syscalls.scm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 0f8927844b..7e16452462 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -794,8 +794,8 @@ terminating nul character." '* ;cmdline unsigned-long))) ;flags (syscall-id (match (utsname:machine (uname)) - ("i686" 320) ("x86_64" 320) + ;; unsupported on i686 ("armv7l" 401) ("aarch64" 294) ("ppc64le" 382) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index eef864d097..d2848879d7 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2021, 2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2021, 2024-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2020 Simon South <simon@simonsouth.net> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> @@ -682,15 +682,15 @@ (when (or (zero? (getuid)) (not (string-contains %host-type "linux"))) (test-skip 1)) -(test-equal "kexec-load-file" - EPERM +(test-assert "kexec-load-file" (catch 'system-error (lambda () (let ((fd1 (open-fdes "/dev/null" O_RDONLY)) (fd2 (open-fdes "/dev/null" O_RDONLY))) (kexec-load-file fd1 fd2 "gnu.repl=yes"))) (lambda args - (system-error-errno args)))) + (member (system-error-errno args) + (list EPERM ENOSYS))))) (test-end) |