From patchwork Mon Jan 6 12:58:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36681 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 482A427BBE9; Mon, 6 Jan 2025 13:00:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BFEB827BBE2 for ; Mon, 6 Jan 2025 13:00:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUmiK-00045Q-SH; Mon, 06 Jan 2025 08:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tUmiH-00043Y-Qi for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tUmiC-0001rF-8m for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=McSLnnb/ZR6MiR5MUGIfVjrDgle3UGjmMP0bdeGOTJQ=; b=kH/Kmj2OzHq5yx6K5vRqCxX6GQGfiAsVUD5fc/ju/7IZiWTm7hARxWIZ66qof95swC0o6oHnLu/T0bTo2l+J+VzL1mWARcIBskatsoysH8fx00sKRWJNkkfQuvfYl2ZpzI3duKeixj1hLDS6FFjROW6u0EcFxloDvxkBznNkZxAQ429AnG39wTH3MYwZ/wGHkD6QoF7hvloVmEUrvhd+2FHELok25Qigj8tdj8bg6dk5BabqlszJ0pQMJNcuIdzLD8vZn/dnP2zhxs85X/nkgZpJxtjX2A/d8m5/FMJnhF/psJVWQ5EpeBwi2Y1s134ZrTmHvfRRj+sOkwQsPlM26A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUmiC-0002WX-2G for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75402] [PATCH 2/3] syscalls: Remove wrong syscall ID for =?utf-8?b?4oCYa2V4ZWNfbG9hZF9maWxl4oCZ?= on i686. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2025 13:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75402 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75402@debbugs.gnu.org Cc: Dariqq , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75402-submit@debbugs.gnu.org id=B75402.17361683459488 (code B ref 75402); Mon, 06 Jan 2025 13:00:04 +0000 Received: (at 75402) by debbugs.gnu.org; 6 Jan 2025 12:59:05 +0000 Received: from localhost ([127.0.0.1]:37166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUmhF-0002Sx-1a for submit@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55186) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUmh9-0002SC-Ub for 75402@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tUmh4-0001d7-Jh; Mon, 06 Jan 2025 07:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=McSLnnb/ZR6MiR5MUGIfVjrDgle3UGjmMP0bdeGOTJQ=; b=ccn+2OFNp5GJI5lbI+29 FRIufsJ8X05hn4sQopN7N/otzozAbR+/sQ+SS1Y6fn0e2FHgyxyS+6Uv4jPuwaMGETZBPI+OeA6gI OGSHiTsbiARtRS3Z2TDUsVU3xawDUB7OK9r/cIqmlrSHRD/0fCj9B81CP/03M/m/MKRYKLBIsiCJc d9brErJHr7LqbX+EzCLjZCPYk6ovAz6dwdYIkKnYvpi4pVYb2LccSkp5a/FbTqe/JRJlqr71xZkjA aDIg40MxA5jxs5Bl88R5h9hFBh7kluJ4s68ZKVxy9it2xYm+CngiaTCXywlkUOYm+F96B3h0yIGeE acwtrh7l07ptIg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 6 Jan 2025 13:58:36 +0100 Message-ID: <6062eaed018a8c738577dbb699d7e0324a4f8746.1736168031.git.ludo@gnu.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)