summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Kumar Banerjee <vijay@rtems.org>2020-04-10 01:51:55 +0530
committerJoel Sherrill <joel@rtems.org>2020-04-10 08:30:58 -0500
commitc41e0c3a6d0ac74d497bfa06c2139a1f83b45d3b (patch)
tree2ea0c46e80de72ed7c415a7006a04a61c1ca5b3a
parentrsb: Use dtc.bset for Spike (diff)
downloadrtems-source-builder-c41e0c3a6d0ac74d497bfa06c2139a1f83b45d3b.tar.bz2
qemu-couverture: update to qemu-stable-4.0.0
-rw-r--r--bare/config/devel/qemu-couverture-git-1.cfg16
-rw-r--r--bare/config/devel/qemu-couverture.bset5
2 files changed, 8 insertions, 13 deletions
diff --git a/bare/config/devel/qemu-couverture-git-1.cfg b/bare/config/devel/qemu-couverture-git-1.cfg
index 4ca79f8..0f5629e 100644
--- a/bare/config/devel/qemu-couverture-git-1.cfg
+++ b/bare/config/devel/qemu-couverture-git-1.cfg
@@ -13,7 +13,7 @@
#
# Couverture QEMU Version.
#
-%define qemu_version e9299f7591c8ecf3389922f4e7672b6bc5deae71
+%define qemu_version 03a7fbcce52e0bca7f033ccba79e7856e82bb437
#
# Couverture QEMU disables for this version.
@@ -23,21 +23,15 @@
#
# Couverture QEMU architectures for this version.
#
-%define qemu_archs arm-softmmu,i386-softmmu,lm32-softmmu,mips-softmmu,ppc-softmmu,sparc-softmmu
+%define qemu_archs arm-softmmu,i386-softmmu,ppc-softmmu,sparc-softmmu
#
# Set Couverture-Qemu source from github.
#
%source set qemu --rsb-file=qemu-couverture-%{qemu_version}.tar.gz https://github.com/AdaCore/qemu/archive/%{qemu_version}.tar.gz
-%hash sha512 qemu-couverture-%{qemu_version}.tar.gz b0479eefb8f067b97828b411b89c6b4ba4097477425a83b7ae439a3c0980c52cdbbbd2b7c85edb412ffe7f20b1822b65be008a989c815ceff72a493e551bbb78
+%hash sha512 qemu-couverture-%{qemu_version}.tar.gz 4b1877f1e8a10508b161a2b65f8e862e2ffa5bfc36cb458cdcad4e8a71a384bbb28e7fb50555008b023691b8187d252870586b1435e31989d059692f53ad6e1c
#
-# Patch to send halt signal to qemu-system-or32 process when RTEMS terminates
+# The Qemu build instructions. We use 4.x.x Release 1.
#
-%patch add qemu %{rtems_http_git}/rtems-tools/plain/tools/qemu/0001-openrisc-terminate-qemu-process-upon-receiving-a-hal.patch
-%hash sha256 0001-openrisc-terminate-qemu-process-upon-receiving-a-hal.patch 88cd5c9e6e2a6bab23bf049a6f4212ff00083b002b73dbe63b2fe9832717f19e
-
-#
-# The Qemu build instructions. We use 1.x.x Release 1.
-#
-%include %{_configdir}/qemu-1-1.cfg
+%include %{_configdir}/qemu-4-1.cfg
diff --git a/bare/config/devel/qemu-couverture.bset b/bare/config/devel/qemu-couverture.bset
index 64024a1..fd5547c 100644
--- a/bare/config/devel/qemu-couverture.bset
+++ b/bare/config/devel/qemu-couverture.bset
@@ -16,10 +16,11 @@ package: qemu-couverture-%{qemu_version}-%{_host}-%{release}
%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
devel/autotools-internal
+devel/capstone
devel/libiconv-1.14-1
devel/gettext-0.18.3.1-1
devel/libffi-3.0.13-1
devel/pixman-0.32.4-1
-devel/glib-2.39.3-1
-devel/dtc-1.4.1-1
+devel/glib-2.48.2-1
+devel/dtc-1.6.0-1
devel/qemu-couverture-git-1