[bug#59085] [PATCH] services: Add x86_64 QEMU target.

[bug#59085] [PATCH] services: Add x86_64 QEMU target.

[Leo Nikkilä]

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 <ekaitz@elenq.tech>
 ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
 ;;;
 ;;; 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))
 
-- 
2.38.0

[bug#59085] [PATCH] services: Add x86_64 QEMU target.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]


Leo Nikkilä <hello@lnikki.la> writes:

> 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(-)

This sounds reasonable to me, I haven't checked the exact values are
correct but I'm assuming they're sensible.

Pushed to master as 9ad311ec15c05efc78f74252e7eb6cddfb0b5cea.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#59085] [PATCH] gnu: Fix copyright line

[Leo Nikkilä]

Thanks Chris,

> This sounds reasonable to me, I haven't checked the exact values are
> correct but I'm assuming they're sensible.

I retrieved these values from QEMU, in `scripts/qemu-binfmt-conf.sh'
as described in the source file. I've also tested that they work on my
aarch64 machine at least.

I also noticed that I added the copyright line to the packages file by
mistake, I've attached another patch to correct this below.

--

This is a follow-up to commit 9ad311ec15c05efc78f74252e7eb6cddfb0b5cea.

* gnu/packages/virtualization.scm: Remove copyright line.
* gnu/services/virtualization.scm: Add copyright line.
---
 gnu/packages/virtualization.scm | 1 -
 gnu/services/virtualization.scm | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4c8662f770..981e5e0cf3 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -28,7 +28,6 @@
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
-;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index b3dc9d2114..601c11b0d1 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.38.0

[bug#59085] [PATCH] gnu: Fix copyright line

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]


Leo Nikkilä <hello@lnikki.la> writes:

> Thanks Chris,
>
>> This sounds reasonable to me, I haven't checked the exact values are
>> correct but I'm assuming they're sensible.
>
> I retrieved these values from QEMU, in `scripts/qemu-binfmt-conf.sh'
> as described in the source file. I've also tested that they work on my
> aarch64 machine at least.

Great :)

> I also noticed that I added the copyright line to the packages file by
> mistake, I've attached another patch to correct this below.

Awesome, thanks, I've finally got around to pushing this now as
d072bcebbf884c68573aeb999db3ae296a7cf939.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]