From patchwork Mon Nov 7 00:09:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 44361 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 AE7A427BBEB; Mon, 7 Nov 2022 00:11:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 8BE7C27BBE9 for ; Mon, 7 Nov 2022 00:11:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orpjE-0001Ra-B9; Sun, 06 Nov 2022 19:11:04 -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 1orpjC-0001RA-F0 for guix-patches@gnu.org; Sun, 06 Nov 2022 19:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orpjC-0007Gp-0z for guix-patches@gnu.org; Sun, 06 Nov 2022 19:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orpjB-0006J0-SX for guix-patches@gnu.org; Sun, 06 Nov 2022 19:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59085] [PATCH] services: Add x86_64 QEMU target. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Nov 2022 00:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59085@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166777980824162 (code B ref -1); Mon, 07 Nov 2022 00:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Nov 2022 00:10:08 +0000 Received: from localhost ([127.0.0.1]:60919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orpiK-0006He-8O for submit@debbugs.gnu.org; Sun, 06 Nov 2022 19:10:08 -0500 Received: from lists.gnu.org ([209.51.188.17]:42450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orpiH-0006HT-4r for submit@debbugs.gnu.org; Sun, 06 Nov 2022 19:10:07 -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 1orpiG-0001Ia-KC for guix-patches@gnu.org; Sun, 06 Nov 2022 19:10:04 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orpi8-0003VF-0A for guix-patches@gnu.org; Sun, 06 Nov 2022 19:10:03 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 6706D5C0106; Sun, 6 Nov 2022 19:09:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 06 Nov 2022 19:09:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1667779793; x=1667866193; bh=2/sgDwWisz xCTPWYAcR9yj6sK5rCGiQA+xztrgF48dA=; b=RvrtFHemvEEDNoWGK4sKklajPC mAGE6rw51MZ/ZDgN9IaJst2CIoSlQoHrSNSnqGzWyTeOGan/NLNjLCwO26NJ6uPL qGLrkJp5Qh3/byWA8bBiT/Jn5OMazCKFBFanPWlDB0Q1tEbv72iuHPpQpzNkndCv 0IqKY+BPUrDPOaMgdB3o7Q0dV0WTcFAebZ0YvBpz8aVVCRdufGzXTHfelu42uJys J334/v0VJywcZOycxy9dKyR4WEWd6nAvdBrxYkIfHB9lIm4AjAqXZixDALQRJGkT B+SdCI4h8rPDoq8eDS4JdS1yC1jU/zpgVSyH+3AEznaYdoZOYRV+bA4p9Phg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667779793; x=1667866193; bh=2/sgDwWiszxCT PWYAcR9yj6sK5rCGiQA+xztrgF48dA=; b=QJtWKCu4UL008Wb8yuM9EUHOgP0zl N0k60/sEjvkVOEPdgO1I4oCdIjZ15nnb3TQpwPr+QY7UHVvkv3AMgawmrT/C3L13 S5z8SVTirQT/J33xHVkZMpkqKYwn7c0E5w0S8GKkq05yB/jyvIz3JuX9/eaMSLat ArGY7LOH8uWj+KWG0Py1lARYIoEgPKqLYDPSffg7WnDVg+yfucAtC0TsOpFu/xTV Ghlhs7QMe9ri2q8E1Vs4QM95vQXjzseEjtZQqN7+gjdKfpraYGNj/EfZqQ4tDgSR ZEYEtRzogYLPg04Mb+er+4bnfbxCCdFilohcnJtw8M79o+HGBf9zJ6KcQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdejgddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfpihhkkhhilhomuceohhgvlhhloheslhhnihhkkhhi rdhlrgeqnecuggftrfgrthhtvghrnheptdffudehleevjedtvefghfeihefhuedugeeihe ejgeehgfdvffegjeefvdetvdegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhephhgvlhhloheslhhnihhkkhhirdhlrg X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 6 Nov 2022 19:09:52 -0500 (EST) From: Leo =?utf-8?q?Nikkil=C3=A4?= Date: Mon, 7 Nov 2022 02:09:45 +0200 Message-Id: <20221107000945.13446-1-hello@lnikki.la> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.26; envelope-from=hello@lnikki.la; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Greetings, I was trying to build an x86_64 binary on an aarch64 machine, and noticed that `qemu-binfmt-service-type' was missing the x86_64 platform definition. * gnu/services/virtualization.scm (%x86_64): Add variable. (%qemu-platforms) Add it. --- gnu/packages/virtualization.scm | 1 + gnu/services/virtualization.scm | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 981e5e0cf3..4c8662f770 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2022 Ekaitz Zarraga ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index cb6227403b..b3dc9d2114 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -611,6 +611,13 @@ (define %i386 (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00")) (mask (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) +(define %x86_64 + (qemu-platform + (name "x86_64") + (family "i386") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) + (define %alpha (qemu-platform (name "alpha") @@ -767,7 +774,7 @@ (define %hppa (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %qemu-platforms - (list %i386 %alpha %arm %sparc32plus %ppc %ppc64 %ppc64le %m68k + (list %i386 %x86_64 %alpha %arm %sparc32plus %ppc %ppc64 %ppc64le %m68k %mips %mipsel %mipsn32 %mipsn32el %mips64 %mips64el %riscv32 %riscv64 %sh4 %sh4eb %s390x %aarch64 %hppa))