From 17df7b3228cb4bc0eb6e8e38c053ff0146069b6d Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@xilinx.com>
Date: Tue, 20 Dec 2016 11:54:20 -0800
Subject: qemu-xilinx: Update to Xilinx's 2016.4 release

Update Xilinx's QEMU to the 2016.4 release which is based off mainline
QEMU version 2.6.0.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
---
 recipes-devtools/qemu/qemu-xilinx_2.2.5.bb | 55 ------------------------------
 recipes-devtools/qemu/qemu-xilinx_2.6.0.bb | 45 ++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 55 deletions(-)
 delete mode 100644 recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
 create mode 100644 recipes-devtools/qemu/qemu-xilinx_2.6.0.bb

(limited to 'recipes-devtools')

diff --git a/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb b/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
deleted file mode 100644
index 06dec532..00000000
--- a/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-QEMU_TARGETS ?= "aarch64 arm microblaze microblazeel"
-
-require recipes-devtools/qemu/qemu.inc
-
-SUMMARY = "Xilinx's fork of a fast open source processor emulator"
-HOMEPAGE = "https://github.com/xilinx/qemu/"
-
-LIC_FILES_CHKSUM = " \
-		file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-		file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
-		"
-
-XILINX_RELEASE_VERSION = "v2016.3"
-SRCREV = "de453ab4cf993f63de502c4efd8a08a347c3b164"
-SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-
-PV = "2.2.50-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}"
-
-# Disable KVM completely
-KVMENABLE = "--disable-kvm"
-
-# Strip all appends (needed because qemu.inc adds patches using overrides)
-SRC_URI[_append] = ""
-
-DISABLE_STATIC_pn-qemu-xilinx-native = ""
-
-PACKAGECONFIG[quorum] = "--enable-quorum, --disable-quorum, gnutls,"
-PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls,"
-PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls,"
-PACKAGECONFIG[gcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt,"
-PACKAGECONFIG[nss] = ""
-PACKAGECONFIG[nettle] = ""
-PACKAGECONFIG[glx] = ""
-PACKAGECONFIG[gnutls] = ""
-PACKAGECONFIG[bzip2] = ""
-
-# append a suffix dir, to allow multiple versions of QEMU to be installed
-datadir_append = "/qemu-xilinx"
-bindir_append = "/qemu-xilinx"
-libexecdir_append = "/qemu-xilinx"
-
-# ensure configure is passed the modified dirs
-EXTRA_OECONF += " \
-		--bindir=${bindir} \
-		--datadir=${datadir} \
-		--mandir=${mandir} \
-		--docdir=${docdir} \
-		"
-
-do_install() {
-	export STRIP="true"
-	autotools_do_install
-}
diff --git a/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb b/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
new file mode 100644
index 00000000..f6c7f304
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
@@ -0,0 +1,45 @@
+QEMU_TARGETS ?= "aarch64 arm microblaze microblazeel"
+
+require recipes-devtools/qemu/qemu.inc
+
+SUMMARY = "Xilinx's fork of a fast open source processor emulator"
+HOMEPAGE = "https://github.com/xilinx/qemu/"
+
+LIC_FILES_CHKSUM = " \
+		file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+		file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
+		"
+
+XILINX_RELEASE_VERSION = "v2016.4"
+SRCREV = "4b90a13118b6e005d688d7aefb0900f7a67531df"
+SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+
+PV = "2.6.0-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}"
+
+# Disable KVM completely
+KVMENABLE = "--disable-kvm"
+
+# Strip all appends (needed because qemu.inc adds patches using overrides)
+SRC_URI[_append] = ""
+
+DISABLE_STATIC_pn-qemu-xilinx-native = ""
+
+# append a suffix dir, to allow multiple versions of QEMU to be installed
+datadir_append = "/qemu-xilinx"
+bindir_append = "/qemu-xilinx"
+libexecdir_append = "/qemu-xilinx"
+
+# ensure configure is passed the modified dirs
+EXTRA_OECONF += " \
+		--bindir=${bindir} \
+		--datadir=${datadir} \
+		--mandir=${mandir} \
+		--docdir=${docdir} \
+		"
+
+do_install() {
+	export STRIP="true"
+	autotools_do_install
+}
-- 
cgit v1.2.3-54-g00ecf