From 410a359d4ac696cb61682dd6cc903319ca295646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 Jan 2025 12:05:04 +0100 Subject: [PATCH] =?UTF-8?q?syscalls:=20Remove=20wrong=20syscall=20ID=20for?= =?UTF-8?q?=20=E2=80=98kexec=5Fload=5Ffile=E2=80=99=20on=20i686.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * 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 Change-Id: I83fe25636addb57533ed88cbfb40107d265b13a7 --- guix/build/syscalls.scm | 2 +- 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 @@ (define kexec-load-file '* ;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 +;;; Copyright © 2014-2021, 2024-2025 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2020 Simon South ;;; Copyright © 2020 Mathieu Othacehe @@ -682,15 +682,15 @@ (define perform-container-tests? (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)