Skip to contentSkip to conversation

package/qemu: reenable Qemu user-land emulation for musl toolchains

PATCH Applied Joseph Burt 3 participants 4 messages Jan 12, 2023 – Jul 13, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qemu: reenable Qemu user-land emulation for musl toolchains

Compatible "struct sigevent" added upstream in musl 1.2.2 [1].

[1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb

---
 package/qemu/Config.in | 5 -----
 1 file changed, 5 deletions(-)
package/qemu/Config.in +0 -5
index 154b98a541..d818bebb34 100644
@@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_QEMU_LINUX_USER
 	bool "Enable Linux user-land emulation"
-	# Incompatible "struct sigevent" definition on musl
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  Say 'y' to build Linux user-land emulators.
 
 # Note: bsd-user can not be build on Linux
 
-comment "Linux user-land emulation needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-
 config BR2_PACKAGE_QEMU_CHOOSE_TARGETS
 	bool "Select individual emulator targets"
 	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER
Signature · 6 lines
2.39.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello,

Le 12/01/2023 à 08:55, Joseph Burt a écrit :

Quoted 3 lines

Compatible "struct sigevent" added upstream in musl 1.2.2 [1].

[1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb

Ok but it would fail with existing (old) prebuilt musl toolchains. Is musl 1.2.2 old enough?

Best regards,
Romain

Quoted 17 lines
---
 package/qemu/Config.in | 5 -----
 1 file changed, 5 deletions(-)
package/qemu/Config.in +0 -2
index 154b98a541..d818bebb34 100644
@@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_QEMU_LINUX_USER
 	bool "Enable Linux user-land emulation"
-	# Incompatible "struct sigevent" definition on musl
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help

package/qemu/Config.in comment "systems emulation needs a toolchain w/ dynamic library" · line 112

Quoted 10 lines
package/qemu/Config.in +0 -3
 	  Say 'y' to build Linux user-land emulators.
 
 # Note: bsd-user can not be build on Linux
 
-comment "Linux user-land emulation needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-
 config BR2_PACKAGE_QEMU_CHOOSE_TARGETS
 	bool "Select individual emulator targets"
 	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw

Hello Romain,

Quoted 2 lines · Romain Naour

Ok but it would fail with existing (old) prebuilt musl toolchains. Is musl 1.2.2 old enough?

Musl 1.2.2 is three years old, and anyone building qemu-user pre musl 1.2.2 has patched qemu and buildroot to do so.
This fails if someone is building qemu-user for the first time on the latest buildroot with a very old musl toolchain.
I hope that is unlikely, but I don't know.

Best wishes,
Joseph
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
In reply to Joseph Burt
Quoted 5 lines · Joseph Burt

Compatible "struct sigevent" added upstream in musl 1.2.2 [1].

[1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb

Applied to master, thanks.

We're more than a year later now so 1.2.2 can definitely be assumed :-)

Regards,
Arnout

Quoted 15 lines
---
  package/qemu/Config.in | 5 -----
  1 file changed, 5 deletions(-)
package/qemu/Config.in +0 -2
index 154b98a541..d818bebb34 100644
@@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library"
 
  config BR2_PACKAGE_QEMU_LINUX_USER
  	bool "Enable Linux user-land emulation"
-	# Incompatible "struct sigevent" definition on musl
-	depends on !BR2_TOOLCHAIN_USES_MUSL
  	help

package/qemu/Config.in comment "systems emulation needs a toolchain w/ dynamic library" · line 112

Quoted 10 lines
package/qemu/Config.in +0 -3
  	  Say 'y' to build Linux user-land emulators.
 
  # Note: bsd-user can not be build on Linux
 
-comment "Linux user-land emulation needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-
  config BR2_PACKAGE_QEMU_CHOOSE_TARGETS
  	bool "Select individual emulator targets"
  	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot