mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

syscalls: Remove wrong syscall ID for ‘kexec_load_file’ on i686.

Browse source 
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
This commit is contained in:
Ludovic Courtès 2025-01-06 12:05:04 +01:00
parent d8b7259197
commit 410a359d4a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/build/syscalls.scm
View file

@ -794,8 +794,8 @@ (define kexec-load-file
'* ;cmdline '* ;cmdline
unsigned-long))) ;flags unsigned-long))) ;flags
(syscall-id (match (utsname:machine (uname)) (syscall-id (match (utsname:machine (uname))
("i686" 320)
("x86_64" 320) ("x86_64" 320)
;; unsupported on i686
("armv7l" 401) ("armv7l" 401)
("aarch64" 294) ("aarch64" 294)
("ppc64le" 382) ("ppc64le" 382)

8
tests/syscalls.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2020 Simon South <simon@simonsouth.net> ;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@ -682,15 +682,15 @@ (define perform-container-tests?
(when (or (zero? (getuid)) (when (or (zero? (getuid))
(not (string-contains %host-type "linux"))) (not (string-contains %host-type "linux")))
(test-skip 1)) (test-skip 1))
(test-equal "kexec-load-file" (test-assert "kexec-load-file"
EPERM
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(let ((fd1 (open-fdes "/dev/null" O_RDONLY)) (let ((fd1 (open-fdes "/dev/null" O_RDONLY))
(fd2 (open-fdes "/dev/null" O_RDONLY))) (fd2 (open-fdes "/dev/null" O_RDONLY)))
(kexec-load-file fd1 fd2 "gnu.repl=yes"))) (kexec-load-file fd1 fd2 "gnu.repl=yes")))
(lambda args (lambda args
(system-error-errno args)))) (member (system-error-errno args)
(list EPERM ENOSYS)))))
(test-end) (test-end)