From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mail.openembedded.org (Postfix) with ESMTP id 341796013D for ; Thu, 16 Jul 2015 11:46:14 +0000 (UTC) Received: by wibud3 with SMTP id ud3so12930816wib.1 for ; Thu, 16 Jul 2015 04:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=JTNo93sm3E7iZM6iv2fde7f5XpbnxJak1rgfQHNzeH4=; b=gU9lvhNqx73Qtlb4EI6oIAggtLHrU45AtIYOUXxJRL9BsBa1Bx+MO0CgoTJxLfq0CM Ybfuqb/WKpv2X2Qvt9oj22mvEqM8azyFT+2mTBZg+0rObtKRUVHwGbkvQu3JKsCiilPp cXn/Wsbsq7geAXY94ftu9Nxh/cMVkl9wVnT+P80BVeXyvTMMjEY7MiLAk7D4FxXi6e/r fnzT82CmlCPw7QkBG4lAb0RhTKn6vWovd86DCGnHPdd9LCp5HHXvdvKETUgInEa7mvcq U3gJE2B4CRvBQWsKDG1DXFYYYT9xmYehePAfFkaut/xkQGBSfAmqAP94hgsQRyGUKau8 qZGA== X-Received: by 10.194.205.101 with SMTP id lf5mr19507660wjc.37.1437047174556; Thu, 16 Jul 2015 04:46:14 -0700 (PDT) Received: from localhost (ip-86-49-34-37.net.upcbroadband.cz. [86.49.34.37]) by smtp.gmail.com with ESMTPSA id ha4sm2751957wib.0.2015.07.16.04.46.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 04:46:13 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Thu, 16 Jul 2015 13:46:42 +0200 To: Cristian Iorga Message-ID: <20150716114642.GB2134@jama> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH v3 1/3] qemu: upgrade to 2.4.0-rc0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2015 11:46:17 -0000 X-Groupsio-MsgNum: 68037 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MW5yreqqjyrRcusr" Content-Disposition: inline --MW5yreqqjyrRcusr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 16, 2015 at 01:56:43PM +0300, Cristian Iorga wrote: > - Get rid of direct use of gnutls APIs in quorum > blockdrv in favour of using the crypto APIs. > - Convert VNC websockets to use crypto APIs. > - qurum and vnc-ws packageconfig options no > longer exist, removed. > - All previous CVE are now included. > - larger_default_ram_size.patch patch removed, > no longer necessary. >=20 > Signed-off-by: Cristian Iorga > --- > meta/recipes-devtools/qemu/qemu.inc | 3 -- > .../qemu/qemu/larger_default_ram_size.patch | 22 --------------- > meta/recipes-devtools/qemu/qemu_2.3.0.bb | 32 ----------------= ------ > meta/recipes-devtools/qemu/qemu_2.4.0-rc0.bb | 22 +++++++++++++++ > 4 files changed, 22 insertions(+), 57 deletions(-) > delete mode 100644 meta/recipes-devtools/qemu/qemu/larger_default_ram_si= ze.patch > delete mode 100644 meta/recipes-devtools/qemu/qemu_2.3.0.bb > create mode 100644 meta/recipes-devtools/qemu/qemu_2.4.0-rc0.bb >=20 > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/= qemu/qemu.inc > index d794af9..eba7d3d 100644 > --- a/meta/recipes-devtools/qemu/qemu.inc > +++ b/meta/recipes-devtools/qemu/qemu.inc > @@ -15,7 +15,6 @@ QEMU_TARGETS ?=3D "arm aarch64 i386 mips mipsel mips64 = mips64el ppc sh4 x86_64" > =20 > SRC_URI =3D "\ > file://powerpc_rom.bin \ > - file://larger_default_ram_size.patch \ > file://disable-grabs.patch \ > file://exclude-some-arm-EABI-obsolete-syscalls.patch \ > file://wacom.patch \ > @@ -89,9 +88,7 @@ PACKAGECONFIG[virtfs] =3D "--enable-virtfs --enable-att= r,--disable-virtfs,libcap a > PACKAGECONFIG[aio] =3D "--enable-linux-aio,--disable-linux-aio,libaio," > PACKAGECONFIG[xfs] =3D "--enable-xfsctl,--disable-xfsctl,xfsprogs," > PACKAGECONFIG[xen] =3D "--enable-xen,--disable-xen,xen,xen-libxenstore x= en-libxenctrl xen-libxenguest" > -PACKAGECONFIG[quorum] =3D "--enable-quorum, --disable-quorum, gnutls," > PACKAGECONFIG[vnc-tls] =3D "--enable-vnc --enable-vnc-tls,--disable-vnc-= tls, gnutls," > -PACKAGECONFIG[vnc-ws] =3D "--enable-vnc --enable-vnc-ws,--disable-vnc-ws= , gnutls," > PACKAGECONFIG[vnc-sasl] =3D "--enable-vnc --enable-vnc-sasl,--disable-vn= c-sasl,cyrus-sasl," > PACKAGECONFIG[vnc-jpeg] =3D "--enable-vnc --enable-vnc-jpeg,--disable-vn= c-jpeg,jpeg," > PACKAGECONFIG[vnc-png] =3D "--enable-vnc --enable-vnc-png,--disable-vnc-= png,libpng," > diff --git a/meta/recipes-devtools/qemu/qemu/larger_default_ram_size.patc= h b/meta/recipes-devtools/qemu/qemu/larger_default_ram_size.patch > deleted file mode 100644 > index 711c360..0000000 > --- a/meta/recipes-devtools/qemu/qemu/larger_default_ram_size.patch > +++ /dev/null > @@ -1,22 +0,0 @@ > -This patch is taken from debian. 128M is too less sometimes if distro > -with lot of packages is booted so this patch raises the default to 384M > - > -It has not been applied to upstream qemu > - > -Khem Raj > - > -Upstream-Status: Pending > - > -Index: qemu-0.14.0/vl.c > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > ---- qemu-0.14.0.orig/vl.c > -+++ qemu-0.14.0/vl.c > -@@ -168,7 +168,7 @@ int main(int argc, char **argv) > - //#define DEBUG_NET > - //#define DEBUG_SLIRP > -=20 > --#define DEFAULT_RAM_SIZE 128 > -+#define DEFAULT_RAM_SIZE 384 > -=20 > - #define MAX_VIRTIO_CONSOLES 1 > -=20 > diff --git a/meta/recipes-devtools/qemu/qemu_2.3.0.bb b/meta/recipes-devt= ools/qemu/qemu_2.3.0.bb > deleted file mode 100644 > index cae0ad1..0000000 > --- a/meta/recipes-devtools/qemu/qemu_2.3.0.bb > +++ /dev/null > @@ -1,32 +0,0 @@ > -require qemu.inc > - > -LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D441c28d2cf86e15a37fa47e15a72f= bac \ > - file://COPYING.LIB;endline=3D24;md5=3Dc04def7ae38850= e7d3ef548588159913" > - > -SRC_URI +=3D "file://configure-fix-Darwin-target-detection.patch \ > - file://qemu-enlarge-env-entry-size.patch \ > - file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ > - file://qemu-CVE-2015-3456.patch \ > - file://01-xen-properly-gate-host-writes-of-modified-PCI-CFG-= contents-CVE-2015-4103.patch \ > - file://02-xen-dont-allow-guest-to-control-MSI-mask-register-= CVE-2015-4104.patch \ > - file://03-xen-MSI-X-limit-error-messages-CVE-2015-4105.patch= \ > - file://04-xen-MSI-dont-open-code-pass-through-of-enable-bit-= mod-CVE-2015-4106.patch \ > - file://05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015= -4106.patch \ > - file://06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-410= 6.patch \ > - file://07-xen-pt-split-out-calculation-of-throughable-mask-C= VE-2015-4106.patch \ > - file://08-xen-pt-mark-all-PCIe-capability-bits-read-only-CVE= -2015-4106.patch \ > - file://09-xen-pt-mark-reserved-bits-in-PCI-config-space-fiel= ds-CVE-2015-4106.patch \ > - file://10-xen-pt-add-a-few-PCI-config-space-field-descriptio= ns-CVE-2015-4106.patch \ > - file://11-xen-pt-unknown-PCI-config-space-fields-should-be-r= eadonly-CVE-2015-4106.patch \ > - file://qemu-fix-CVE-2015-3209.patch \ > - " > -SRC_URI_prepend =3D "http://wiki.qemu-project.org/download/${BP}.tar.bz2" > -SRC_URI[md5sum] =3D "2fab3ea4460de9b57192e5b8b311f221" > -SRC_URI[sha256sum] =3D "b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5d= ed18893bd8281588" > - > -COMPATIBLE_HOST_class-target_mips64 =3D "null" > - > -do_install_append() { > - # Prevent QA warnings about installed ${localstatedir}/run > - if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/= run; fi > -} > diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0-rc0.bb b/meta/recipes-= devtools/qemu/qemu_2.4.0-rc0.bb > new file mode 100644 > index 0000000..c4505ba > --- /dev/null > +++ b/meta/recipes-devtools/qemu/qemu_2.4.0-rc0.bb > @@ -0,0 +1,22 @@ > +require qemu.inc > + > +LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D441c28d2cf86e15a37fa47e15a72f= bac \ > + file://COPYING.LIB;endline=3D24;md5=3Dc04def7ae38850= e7d3ef548588159913" > + > +SRC_URI +=3D "file://configure-fix-Darwin-target-detection.patch \ > + file://qemu-enlarge-env-entry-size.patch \ > + file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ > + " > +SRC_URI_prepend =3D "http://wiki.qemu-project.org/download/${BPN}-${REAL= PV}.tar.bz2" > +SRC_URI[md5sum] =3D "0c890db3811f2ad9cc7bb2a5afe08e4c" > +SRC_URI[sha256sum] =3D "8dda3e0f9baffbe29b524c03fd46d611afed1dfb5da1bece= c033beaf76a1bc6d" > +S=3D"${WORKDIR}/${BPN}-${REALPV}" > +REALPV =3D "2.4.0-rc0" > +PV =3D "2.3.0+${REALPV}" It's better to use something like 2.3.99+${REALPV} to make sure it sorts higher than any 2.3.* version (e.g. if someone is using some newer revision from 2.3 branch. > + > +COMPATIBLE_HOST_class-target_mips64 =3D "null" > + > +do_install_append() { > + # Prevent QA warnings about installed ${localstatedir}/run > + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/= run; fi > +} > --=20 > 2.1.4 >=20 > --=20 > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --MW5yreqqjyrRcusr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlWnmaEACgkQN1Ujt2V2gBy1uwCfdTEpmyuyp0pnyr7aShEKU7nP PtIAn1iZeQ7zROXucJg0D5pOB1OpXpYR =X2Yh -----END PGP SIGNATURE----- --MW5yreqqjyrRcusr--