From 07261837a25a6b2be4f839a1a43484ddf19f5140 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 13 Nov 2020 09:24:06 +1100
Subject: devel/qemu: Update QEMU to 5.2.0-rc1

- This version of qemu uses meson and ninja to build. You will need
  to install ninja to build. No checks are made until meson run
---
 bare/config/devel/qemu-5.2.0-1.cfg | 42 ++++++++++++++++++++++++++++++++++++++
 bare/config/devel/qemu.bset        |  2 +-
 bare/config/devel/qemu4-git-1.cfg  | 42 --------------------------------------
 bare/config/devel/qemu4.bset       | 25 -----------------------
 4 files changed, 43 insertions(+), 68 deletions(-)
 create mode 100644 bare/config/devel/qemu-5.2.0-1.cfg
 delete mode 100644 bare/config/devel/qemu4-git-1.cfg
 delete mode 100644 bare/config/devel/qemu4.bset

(limited to 'bare')

diff --git a/bare/config/devel/qemu-5.2.0-1.cfg b/bare/config/devel/qemu-5.2.0-1.cfg
new file mode 100644
index 0000000..8c80ffc
--- /dev/null
+++ b/bare/config/devel/qemu-5.2.0-1.cfg
@@ -0,0 +1,42 @@
+#
+# Qemu from git
+#
+
+%if %{release} == %{nil}
+ %define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%include %{_configdir}/bare-config.cfg
+
+#
+# Stable version. Qemu is fast moving.
+#
+%define qemu_version 5.2.0-rc1
+
+#
+# Use release sources.
+#
+%source set qemu https://download.qemu.org/qemu-%{qemu_version}.tar.xz
+#%hash sha512 qemu-%{qemu_version}.tar.xz \
+#        gv1RcCp7mxsAsvG9O0qDK4AkkBjbuhrdCwpz59S+5FKv1FV0tNjffORHfYcR872kygcqGm3iWJXJPrIc94/Esg==
+
+#
+# Patches from Qemu's patchworks site.
+#
+%patch add qemu pw://patchwork.ozlabs.org/patch/406903/raw/Provide-the-missing-LIBUSB_LOG_LEVEL_-for-older-libusb-or-FreeBSD.-Providing-just-the-needed-value-as-a-defined..patch
+%hash sha256 Provide-the-missing-LIBUSB_LOG_LEVEL_-for-older-libusb-or-FreeBSD.-Providing-just-the-needed-value-as-a-defined..patch \
+         40399fcedb44b2c1bfa1a95af482f7f335f42d713967ed2f34980a7a940c3740
+
+#
+# Patches to build qemu sparc with Leon3 support
+#
+%patch add qemu https://gaisler.se/qemu/qemu-5.2.0-leon3.patch
+%hash sha512 qemu-5.2.0-leon3.patch \
+       cQju/ja5SAM+gsXEkzSteeR+7PjG9g2w+yUb4kg1eZoOSm2MmZDjA/auINVdRax8wgtIEWnzq5/hdY7/THnowg==
+
+#
+# The Qemu build instructions. We use 5.x.x Release 1.
+#
+%include %{_configdir}/qemu-5-1.cfg
diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset
index a8b1ebf..3a9b0d5 100644
--- a/bare/config/devel/qemu.bset
+++ b/bare/config/devel/qemu.bset
@@ -21,4 +21,4 @@ devel/gettext-0.18.3.1-1
 devel/libffi-3.0.13-1
 devel/pixman-0.40.0-1
 devel/glib-2.48.2-1
-devel/qemu-git-1
+devel/qemu-5.2.0-1
diff --git a/bare/config/devel/qemu4-git-1.cfg b/bare/config/devel/qemu4-git-1.cfg
deleted file mode 100644
index ff241bb..0000000
--- a/bare/config/devel/qemu4-git-1.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Qemu from git
-#
-
-%if %{release} == %{nil}
- %define release 1
-%endif
-
-%include %{_configdir}/base.cfg
-
-%include %{_configdir}/bare-config.cfg
-
-#
-# Stable version. Qemu is fast moving.
-#
-%define qemu_version 4.1.0
-
-#
-# Use release sources.
-#
-%source set qemu https://download.qemu.org/qemu-%{qemu_version}.tar.xz
-%hash sha512 qemu-%{qemu_version}.tar.xz \
-        gv1RcCp7mxsAsvG9O0qDK4AkkBjbuhrdCwpz59S+5FKv1FV0tNjffORHfYcR872kygcqGm3iWJXJPrIc94/Esg==
-
-#
-# Patches from Qemu's patchworks site.
-#
-%patch add qemu pw://patchwork.ozlabs.org/patch/406903/raw/Provide-the-missing-LIBUSB_LOG_LEVEL_-for-older-libusb-or-FreeBSD.-Providing-just-the-needed-value-as-a-defined..patch
-%hash sha256 Provide-the-missing-LIBUSB_LOG_LEVEL_-for-older-libusb-or-FreeBSD.-Providing-just-the-needed-value-as-a-defined..patch \
-         40399fcedb44b2c1bfa1a95af482f7f335f42d713967ed2f34980a7a940c3740
-
-#
-# Patches to build qemu-4.1.0-sparc with Leon3 support
-#
-%patch add qemu https://gaisler.se/qemu/qemu-4.1.0-leon3.patch
-%hash sha256 qemu-4.1.0-leon3.patch \
-         d62ff3418903f1c5eb7f6d727af0400caeb250e23cc120111930601c9ecce02a
-
-#
-# The Qemu build instructions. We use 4.x.x Release 1.
-#
-%include %{_configdir}/qemu-4-1.cfg
diff --git a/bare/config/devel/qemu4.bset b/bare/config/devel/qemu4.bset
deleted file mode 100644
index fa52084..0000000
--- a/bare/config/devel/qemu4.bset
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Build set for QEMU
-#
-
-%define release 1
-
-#
-# Name of the package.
-#
-package: qemu-%{qemu_version}-%{_host}-%{release}
-
-#
-# A magic internal path that would break if changes in the defaults.mc
-# macro file are made.
-#
-%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
-
-# I don't think these are needed anymore ...?
-#devel/autotools-internal
-devel/libiconv-1.14-1
-devel/gettext-0.18.3.1-1
-devel/libffi-3.0.13-1
-devel/pixman-0.40.0-1
-devel/glib-2.46.2-1
-devel/qemu4-git-1
-- 
cgit v1.2.3