From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Feb 2022 13:44:48 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJaim-00G9XC-EA for lore@lore.pengutronix.de; Mon, 14 Feb 2022 13:44:48 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nJail-0002ie-8y; Mon, 14 Feb 2022 13:44:47 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nJahT-0002Oa-Bi; Mon, 14 Feb 2022 13:43:27 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nJahT-00GY64-B7; Mon, 14 Feb 2022 13:43:26 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nJahR-003WHq-P5; Mon, 14 Feb 2022 13:43:25 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 14 Feb 2022 13:43:25 +0100 Message-Id: <20220214124325.839051-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220207083039.1009657-1-christian.melki@t2data.com> References: <20220207083039.1009657-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] qemu: Version bump. 6.1.0 -> 6.2.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 85f2b3ff2df61f33c495430ae4ad3c344ebe26b1. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:25 +0100, Christian Melki 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 > Message-Id: <20220207083039.1009657-1-christian.melki@t2data.com> > [mol: fix host-qemu configure options] > Signed-off-by: Michael Olbrich > > 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 > 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