From 97974bed3db92cb19a0635f9d900c376763d76c6 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Thu, 16 Jun 2016 16:58:01 +0800 Subject: qemu: upgrade to v2.4 plus fsl patches Detailed commit log can be found at: http://git.freescale.com/git/cgit.cgi/ppc/sdk/qemu.git/log/?h=sdk-v2.0.x Signed-off-by: Ting Liu --- conf/machine/include/qoriq.inc | 2 +- recipes-devtools/qemu/qemu_fslgit.bb | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index 5a3a333..f99f4e7 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" -PREFERRED_VERSION_qemu = "2.2.0+fsl" +PREFERRED_VERSION_qemu = "2.4.0+fsl" PREFERRED_VERSION_openssl = "1.0.1i" PREFERRED_VERSION_cryptodev-linux = "1.7" PREFERRED_VERSION_cryptodev-module = "1.7" diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb index 5e991f5..08a31a9 100644 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ b/recipes-devtools/qemu/qemu_fslgit.bb @@ -5,23 +5,16 @@ require recipes-devtools/qemu/qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -# This means QEMU v2.2.0 with FSL specific patches applied -PV = "2.2.0+fsl" +# This means QEMU v2.4.0 with FSL specific patches applied +PV = "2.4.0+fsl" -# FIXME: this recipe requires poky's qemu.inc which assumes version 2.3 -# where glx enable config option changed to --enable-opengl. For now we -# restore it, but we should remove the following lines when upgrading -# to qemu 2.3: -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa" -# remove not supported PACKAGECONFIG by this v2.2.0 based recipe -PACKAGECONFIG[gnutls] = "" +# remove not supported PACKAGECONFIG by this recipe PACKAGECONFIG[gcrypt] = "" PACKAGECONFIG[nettle] = "" PACKAGECONFIG[nss] = "" -RDEPENDS_${PN}_append = " gnutls" -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.9.x" -SRCREV = "8362a298c4feef33c84d7db2d111af18bd29ef86" +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v2.0.x" +SRCREV = "4b846e9b2b15660abace52dd27a406af08c4212d" # add ptest patches SRC_URI_append = "\ -- cgit v1.2.3-54-g00ecf