* [ptxdist] [PATCH v2] qemu: Version bump. 6.1.0 -> 6.2.0
@ 2022-02-07 8:30 Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2022-02-07 8:30 UTC (permalink / raw)
To: ptxdist
https://wiki.qemu.org/ChangeLog/6.2
* Add options to enable/disable audio support for alsa/pa.
* Malloc option changed from --enable/disable to --enable=.
* Malloc variants default to disabled.
* Add pulseaudio rpath-link path to pulseaudio libraries.
Pulseaudio has hardcoded absolute rpaths in the libpulse.so library.
* Move patchset, applies cleanly.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...symlinks-for-security_model-mapped-f.patch | 0
.../0002-let-ninja-use-the-jobserver.patch | 4 ++--
patches/{qemu-6.1.0 => qemu-6.2.0}/series | 0
rules/qemu.in | 22 +++++++++++++++----
rules/qemu.make | 14 +++++++-----
5 files changed, 29 insertions(+), 11 deletions(-)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/0002-let-ninja-use-the-jobserver.patch (89%)
rename patches/{qemu-6.1.0 => qemu-6.2.0}/series (100%)
diff --git a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 100%
rename from patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
diff --git a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
similarity index 89%
rename from patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
rename to patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
index 0de2e99f3..5df864c39 100644
--- a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 401c623a65f8..36a0557d2aa8 100644
+index 74c5b46d38b5..4b3e390e8947 100644
--- a/Makefile
+++ b/Makefile
-@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
+@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
diff --git a/patches/qemu-6.1.0/series b/patches/qemu-6.2.0/series
similarity index 100%
rename from patches/qemu-6.1.0/series
rename to patches/qemu-6.2.0/series
diff --git a/rules/qemu.in b/rules/qemu.in
index b14dd53d4..eb689a188 100644
--- a/rules/qemu.in
+++ b/rules/qemu.in
@@ -10,10 +10,12 @@ menuconfig QEMU
select GLIB
select LIBCAP_NG
select ZLIB
- select SDL2 if QEMU_SDL
- select GTK if QEMU_GTK
- select LIBUSB if QEMU_SYS
- select PIXMAN if QEMU_SYS
+ select SDL2 if QEMU_SDL
+ select GTK if QEMU_GTK
+ select LIBUSB if QEMU_SYS
+ select PIXMAN if QEMU_SYS
+ select PULSEAUDIO if QEMU_PULSEAUDIO
+ select ALSA_LIB if QEMU_ALSA
help
QEMU is a generic and open source machine emulator and
virtualizer.
@@ -41,6 +43,18 @@ config QEMU_GTK
help
Say y to build with GTK support.
+config QEMU_PULSEAUDIO
+ bool
+ prompt "Enable pulseaudio output support."
+ help
+ Say y to build with pa support.
+
+config QEMU_ALSA
+ bool
+ prompt "Enable alsa audio output support."
+ help
+ Say y to build with alsa support.
+
config QEMU_TOOLS
bool
prompt "Enable tools"
diff --git a/rules/qemu.make b/rules/qemu.make
index 756633a0b..2c06204f8 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
#
# Paths and names
#
-QEMU_VERSION := 6.1.0
-QEMU_MD5 := 47f776c276a24f42108ba512a2aa3013
+QEMU_VERSION := 6.2.0
+QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be
QEMU := qemu-$(QEMU_VERSION)
QEMU_SUFFIX := tar.xz
QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
@@ -52,7 +52,8 @@ QEMU_CONF_OPT := \
--disable-strip \
--disable-werror \
--enable-stack-protector \
- --audio-drv-list= \
+ --$(call ptx/endis, PTXCONF_QEMU_ALSA)-alsa \
+ --$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \
--block-drv-rw-whitelist= \
--block-drv-ro-whitelist= \
--enable-trace-backends=nop \
@@ -143,8 +144,6 @@ QEMU_CONF_OPT := \
--disable-libssh \
--disable-numa \
--disable-libxml2 \
- --disable-tcmalloc \
- --disable-jemalloc \
--enable-replication \
--disable-opengl \
--disable-virglrenderer \
@@ -173,6 +172,11 @@ QEMU_CONF_OPT := \
--disable-fuzzing \
--disable-keyring
+ifdef PTXCONF_QEMU_PULSEAUDIO
+QEMU_LDFLAGS := \
+ -Wl,-rpath-link,$(SYSROOT)/usr/lib/pulseaudio
+endif
+
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] qemu: Version bump. 6.1.0 -> 6.2.0
2022-02-07 8:30 [ptxdist] [PATCH v2] qemu: Version bump. 6.1.0 -> 6.2.0 Christian Melki
@ 2022-02-14 12:43 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 85f2b3ff2df61f33c495430ae4ad3c344ebe26b1.
Michael
[sent from post-receive hook]
On Mon, 14 Feb 2022 13:43:25 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> https://wiki.qemu.org/ChangeLog/6.2
>
> * Add options to enable/disable audio support for alsa/pa.
> * Malloc option changed from --enable/disable to --enable=.
> * Malloc variants default to disabled.
> * Add pulseaudio rpath-link path to pulseaudio libraries.
> Pulseaudio has hardcoded absolute rpaths in the libpulse.so library.
> * Move patchset, applies cleanly.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220207083039.1009657-1-christian.melki@t2data.com>
> [mol: fix host-qemu configure options]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> similarity index 100%
> rename from patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> rename to patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> diff --git a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
> similarity index 89%
> rename from patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
> rename to patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
> index 0de2e99f3c97..5df864c39894 100644
> --- a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
> +++ b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> -index 401c623a65f8..36a0557d2aa8 100644
> +index 74c5b46d38b5..4b3e390e8947 100644
> --- a/Makefile
> +++ b/Makefile
> -@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> +@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
> NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
> diff --git a/patches/qemu-6.1.0/series b/patches/qemu-6.2.0/series
> similarity index 100%
> rename from patches/qemu-6.1.0/series
> rename to patches/qemu-6.2.0/series
> diff --git a/rules/host-qemu.make b/rules/host-qemu.make
> index 885e76ba9e28..a324c2e3e079 100644
> --- a/rules/host-qemu.make
> +++ b/rules/host-qemu.make
> @@ -148,8 +148,6 @@ HOST_QEMU_CONF_OPT := \
> --disable-libssh \
> --disable-numa \
> --disable-libxml2 \
> - --disable-tcmalloc \
> - --disable-jemalloc \
> --enable-replication \
> --disable-opengl \
> --disable-virglrenderer \
> diff --git a/rules/qemu.in b/rules/qemu.in
> index b14dd53d43c5..eb689a188d3f 100644
> --- a/rules/qemu.in
> +++ b/rules/qemu.in
> @@ -10,10 +10,12 @@ menuconfig QEMU
> select GLIB
> select LIBCAP_NG
> select ZLIB
> - select SDL2 if QEMU_SDL
> - select GTK if QEMU_GTK
> - select LIBUSB if QEMU_SYS
> - select PIXMAN if QEMU_SYS
> + select SDL2 if QEMU_SDL
> + select GTK if QEMU_GTK
> + select LIBUSB if QEMU_SYS
> + select PIXMAN if QEMU_SYS
> + select PULSEAUDIO if QEMU_PULSEAUDIO
> + select ALSA_LIB if QEMU_ALSA
> help
> QEMU is a generic and open source machine emulator and
> virtualizer.
> @@ -41,6 +43,18 @@ config QEMU_GTK
> help
> Say y to build with GTK support.
>
> +config QEMU_PULSEAUDIO
> + bool
> + prompt "Enable pulseaudio output support."
> + help
> + Say y to build with pa support.
> +
> +config QEMU_ALSA
> + bool
> + prompt "Enable alsa audio output support."
> + help
> + Say y to build with alsa support.
> +
> config QEMU_TOOLS
> bool
> prompt "Enable tools"
> diff --git a/rules/qemu.make b/rules/qemu.make
> index 756633a0b722..2c06204f87e8 100644
> --- a/rules/qemu.make
> +++ b/rules/qemu.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
> #
> # Paths and names
> #
> -QEMU_VERSION := 6.1.0
> -QEMU_MD5 := 47f776c276a24f42108ba512a2aa3013
> +QEMU_VERSION := 6.2.0
> +QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be
> QEMU := qemu-$(QEMU_VERSION)
> QEMU_SUFFIX := tar.xz
> QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
> @@ -52,7 +52,8 @@ QEMU_CONF_OPT := \
> --disable-strip \
> --disable-werror \
> --enable-stack-protector \
> - --audio-drv-list= \
> + --$(call ptx/endis, PTXCONF_QEMU_ALSA)-alsa \
> + --$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \
> --block-drv-rw-whitelist= \
> --block-drv-ro-whitelist= \
> --enable-trace-backends=nop \
> @@ -143,8 +144,6 @@ QEMU_CONF_OPT := \
> --disable-libssh \
> --disable-numa \
> --disable-libxml2 \
> - --disable-tcmalloc \
> - --disable-jemalloc \
> --enable-replication \
> --disable-opengl \
> --disable-virglrenderer \
> @@ -173,6 +172,11 @@ QEMU_CONF_OPT := \
> --disable-fuzzing \
> --disable-keyring
>
> +ifdef PTXCONF_QEMU_PULSEAUDIO
> +QEMU_LDFLAGS := \
> + -Wl,-rpath-link,$(SYSROOT)/usr/lib/pulseaudio
> +endif
> +
> # ----------------------------------------------------------------------------
> # Install
> # ----------------------------------------------------------------------------
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-14 12:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-07 8:30 [ptxdist] [PATCH v2] qemu: Version bump. 6.1.0 -> 6.2.0 Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox