Skip to contentSkip to conversation

package/qemu: bump to version 8.1.0

PATCH In review James Hilliard 2 participants 3 messages Aug 25, 2023 – Aug 27, 2023 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qemu: bump to version 8.1.0

Drop patch which is now upstream.

Replace no longer supported --with-git-submodules config option with new --disable-download option.

Replace no longer supported --meson config option with --python config option. The configure script expects --python to point to the python interpreter with the meson installation.

---
 ...tall-keyboard-maps-only-if-necessary.patch | 38 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  8 ++--
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch deleted +0 -38
deleted file mode 100644
index 8ba7f3cf15..0000000000
@@ -1,38 +0,0 @@
-From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <[email protected]>
-Date: Sun, 1 Jan 2023 21:00:57 -0300
-Subject: [PATCH] meson: install keyboard maps only if necessary
-
-They are required only for system emulation (i.e. have_system is true).
-
-Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/[email protected]/
-Signed-off-by: Carlos Santos <[email protected]>
-Signed-off-by: Carlos Santos <[email protected]>
----
- pc-bios/keymaps/meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
-index 158a3b410c..bff3083313 100644
---- a/pc-bios/keymaps/meson.build
-+++ b/pc-bios/keymaps/meson.build
-@@ -47,7 +47,7 @@ if native_qemu_keymap.found()
-                        build_by_default: true,
-                        output: km,
-                        command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
--                       install: true,
-+                       install: have_system,
-                        install_dir: qemu_datadir / 'keymaps')
-   endforeach
- 
-@@ -56,4 +56,6 @@ else
-   install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
- endif
- 
--install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+if have_system
-+  install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+endif
--- 
-2.31.1
-
package/qemu/qemu.hash +1 -1
index e71742c243..506afa8bf3 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09  qemu-8.0.3.tar.xz
+sha256  710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55  qemu-8.1.0.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +4 -4
index b341d0220d..84166958bb 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 8.0.3
+QEMU_VERSION = 8.1.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -272,7 +272,7 @@ define QEMU_CONFIGURE_CMDS
 			--prefix=/usr \
 			--cross-prefix=$(TARGET_CROSS) \
 			--audio-drv-list= \
-			--meson=$(HOST_DIR)/bin/meson \
+			--python=$(HOST_DIR)/bin/python3 \
 			--ninja=$(HOST_DIR)/bin/ninja \
 			--disable-alsa \
 			--disable-bpf \
@@ -313,7 +313,7 @@ define QEMU_CONFIGURE_CMDS
 			--enable-attr \
 			--enable-kvm \
 			--enable-vhost-net \
-			--with-git-submodules=ignore \
+			--disable-download \
 			--disable-hexagon-idef-parser \
 			$(QEMU_OPTS)
 endef
@@ -458,7 +458,7 @@ define HOST_QEMU_CONFIGURE_CMDS
 		--host-cc="$(HOSTCC)" \
 		--extra-cflags="$(HOST_QEMU_CFLAGS)" \
 		--extra-ldflags="$(HOST_LDFLAGS)" \
-		--meson=$(HOST_DIR)/bin/meson \
+		--python=$(HOST_DIR)/bin/python3 \
 		--ninja=$(HOST_DIR)/bin/ninja \
 		--disable-alsa \
 		--disable-bpf \
Signature · 6 lines
2.34.1

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

Hello James,

Le 26/08/2023 à 00:49, James Hilliard a écrit :

Quoted 8 lines

Drop patch which is now upstream.

Replace no longer supported --with-git-submodules config option with new --disable-download option.

Replace no longer supported --meson config option with --python config option. The configure script expects --python to point to the python interpreter with the meson installation.

There is a great help on the Qemu Changelog about any new build dependencies:

https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies

Like for the jack backend, I would disable the pipewire backend for host-qemu. The pipewire optional dependency must be handled for qemu for the target otherwise the build is not "reproducible".

What about the new Python build dependencies on python3-venv ?

I did a runtime test as is on most of qemu defconfig:
https://gitlab.com/kubu93/buildroot/-/pipelines/982794362

Best regards,
Romain

Quoted 95 lines
---
 ...tall-keyboard-maps-only-if-necessary.patch | 38 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  8 ++--
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch deleted +0 -38
deleted file mode 100644
index 8ba7f3cf15..0000000000
@@ -1,38 +0,0 @@
-From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <[email protected]>
-Date: Sun, 1 Jan 2023 21:00:57 -0300
-Subject: [PATCH] meson: install keyboard maps only if necessary
-
-They are required only for system emulation (i.e. have_system is true).
-
-Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/[email protected]/
-Signed-off-by: Carlos Santos <[email protected]>
-Signed-off-by: Carlos Santos <[email protected]>
----
- pc-bios/keymaps/meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
-index 158a3b410c..bff3083313 100644
---- a/pc-bios/keymaps/meson.build
-+++ b/pc-bios/keymaps/meson.build
-@@ -47,7 +47,7 @@ if native_qemu_keymap.found()
-                        build_by_default: true,
-                        output: km,
-                        command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
--                       install: true,
-+                       install: have_system,
-                        install_dir: qemu_datadir / 'keymaps')
-   endforeach
- 
-@@ -56,4 +56,6 @@ else
-   install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
- endif
- 
--install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+if have_system
-+  install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+endif
--- 
-2.31.1
-
package/qemu/qemu.hash +1 -1
index e71742c243..506afa8bf3 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09  qemu-8.0.3.tar.xz
+sha256  710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55  qemu-8.1.0.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +3 -3
index b341d0220d..84166958bb 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 8.0.3
+QEMU_VERSION = 8.1.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -272,7 +272,7 @@ define QEMU_CONFIGURE_CMDS
 			--prefix=/usr \
 			--cross-prefix=$(TARGET_CROSS) \
 			--audio-drv-list= \
-			--meson=$(HOST_DIR)/bin/meson \
+			--python=$(HOST_DIR)/bin/python3 \
 			--ninja=$(HOST_DIR)/bin/ninja \
 			--disable-alsa \
 			--disable-bpf \
@@ -313,7 +313,7 @@ define QEMU_CONFIGURE_CMDS
 			--enable-attr \
 			--enable-kvm \
 			--enable-vhost-net \
-			--with-git-submodules=ignore \
+			--disable-download \
 			--disable-hexagon-idef-parser \
 			$(QEMU_OPTS)
 endef

package/qemu/qemu.mk define HOST_QEMU_CONFIGURE_CMDS · line 464

Quoted 8 lines
package/qemu/qemu.mk +1 -1
@@ -458,7 +458,7 @@ define HOST_QEMU_CONFIGURE_CMDS
 		--host-cc="$(HOSTCC)" \
 		--extra-cflags="$(HOST_QEMU_CFLAGS)" \
 		--extra-ldflags="$(HOST_LDFLAGS)" \
-		--meson=$(HOST_DIR)/bin/meson \
+		--python=$(HOST_DIR)/bin/python3 \
 		--ninja=$(HOST_DIR)/bin/ninja \
 		--disable-alsa \
 		--disable-bpf \

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

#2 lore raw
Quoted 13 lines · Romain Naour

Hello James,

Quoted 8 lines · James Hilliard

Drop patch which is now upstream.

Replace no longer supported --with-git-submodules config option with new --disable-download option.

Replace no longer supported --meson config option with --python config option. The configure script expects --python to point to the python interpreter with the meson installation.

Quoted 7 lines

There is a great help on the Qemu Changelog about any new build dependencies:

https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies

Like for the jack backend, I would disable the pipewire backend for host-qemu. The pipewire optional dependency must be handled for qemu for the target otherwise the build is not "reproducible".

Added explicit handling for pipewire in my v2 for host and target qemu.

Quoted 2 lines

What about the new Python build dependencies on python3-venv ?

Well python3-venv is part of the standard library and we don't support building host-python3 without venv support so there's nothing needed there AFAICT.

I did notice it's recommended that we depend on host-python-distlib, so I've added that as a build dependency in my v2:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Quoted 103 lines

I did a runtime test as is on most of qemu defconfig:
https://gitlab.com/kubu93/buildroot/-/pipelines/982794362

Best regards,
Romain

Quoted 95 lines
---
 ...tall-keyboard-maps-only-if-necessary.patch | 38 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  8 ++--
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch deleted +0 -38
deleted file mode 100644
index 8ba7f3cf15..0000000000
@@ -1,38 +0,0 @@
-From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <[email protected]>
-Date: Sun, 1 Jan 2023 21:00:57 -0300
-Subject: [PATCH] meson: install keyboard maps only if necessary
-
-They are required only for system emulation (i.e. have_system is true).
-
-Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/[email protected]/
-Signed-off-by: Carlos Santos <[email protected]>
-Signed-off-by: Carlos Santos <[email protected]>
----
- pc-bios/keymaps/meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
-index 158a3b410c..bff3083313 100644
---- a/pc-bios/keymaps/meson.build
-+++ b/pc-bios/keymaps/meson.build
-@@ -47,7 +47,7 @@ if native_qemu_keymap.found()
-                        build_by_default: true,
-                        output: km,
-                        command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
--                       install: true,
-+                       install: have_system,
-                        install_dir: qemu_datadir / 'keymaps')
-   endforeach
-
-@@ -56,4 +56,6 @@ else
-   install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
- endif
-
--install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+if have_system
-+  install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
-+endif
---
-2.31.1
-
package/qemu/qemu.hash +1 -1
index e71742c243..506afa8bf3 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09  qemu-8.0.3.tar.xz
+sha256  710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55  qemu-8.1.0.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +3 -3
index b341d0220d..84166958bb 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 8.0.3
+QEMU_VERSION = 8.1.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -272,7 +272,7 @@ define QEMU_CONFIGURE_CMDS
                      --prefix=/usr \
                      --cross-prefix=$(TARGET_CROSS) \
                      --audio-drv-list= \
-                     --meson=$(HOST_DIR)/bin/meson \
+                     --python=$(HOST_DIR)/bin/python3 \
                      --ninja=$(HOST_DIR)/bin/ninja \
                      --disable-alsa \
                      --disable-bpf \
@@ -313,7 +313,7 @@ define QEMU_CONFIGURE_CMDS
                      --enable-attr \
                      --enable-kvm \
                      --enable-vhost-net \
-                     --with-git-submodules=ignore \
+                     --disable-download \
                      --disable-hexagon-idef-parser \
                      $(QEMU_OPTS)
 endef
@@ -458,7 +458,7 @@ define HOST_QEMU_CONFIGURE_CMDS
Quoted 9 lines

package/qemu/qemu.mk define HOST_QEMU_CONFIGURE_CMDS · line 464

Quoted 8 lines
package/qemu/qemu.mk +1 -1
              --host-cc="$(HOSTCC)" \
              --extra-cflags="$(HOST_QEMU_CFLAGS)" \
              --extra-ldflags="$(HOST_LDFLAGS)" \
-             --meson=$(HOST_DIR)/bin/meson \
+             --python=$(HOST_DIR)/bin/python3 \
              --ninja=$(HOST_DIR)/bin/ninja \
              --disable-alsa \
              --disable-bpf \

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