From 42b7e8a4faa4a4601a69da78e02092ebdb81b7d9 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 10 Jun 2020 14:57:58 +1000 Subject: devel/qemu4: Use release source tarball Git cannot be used for a release as our release process does not package the source in a manner qemu expects. Closes #3976 --- bare/config/devel/qemu4-git-1.cfg | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) (limited to 'bare') diff --git a/bare/config/devel/qemu4-git-1.cfg b/bare/config/devel/qemu4-git-1.cfg index 02b093d..ff241bb 100644 --- a/bare/config/devel/qemu4-git-1.cfg +++ b/bare/config/devel/qemu4-git-1.cfg @@ -13,44 +13,28 @@ # # Stable version. Qemu is fast moving. # -%define qemu_version v4.1.0 +%define qemu_version 4.1.0 # -# Qemu is from GIT unless the RSB has been released. +# Use release sources. # -# We need to handle the release process -# -%if %{rsb_released} && %{!defined without_release_url} - %source set qemu %{rtems_release_url}/%{rtems_version}/sources/qemu-git-42d58e7.tar.xz -%else - %source set qemu git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc -%endif +%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 - -# -# These patches are broken. -# -#%patch add qemu pw://patchwork.ozlabs.org/patch/347503/raw/CAN-bus-simple-SJA1000-PCI-card-emulation-for-QEMU.patch -#%hash md5 CAN-bus-simple-SJA1000-PCI-card-emulation-for-QEMU.patch fbbe8f02867b8b8ee7c23c83cf1e1efa -#%patch add qemu pw://patchwork.ozlabs.org/patch/347502/raw/CAN-bus-Kvaser-PCI-CAN-S-single-SJA1000-channel-emulation-added.patch -#%hash md5 CAN-bus-Kvaser-PCI-CAN-S-single-SJA1000-channel-emulation-added.patch 7bd24fa8b55116c9a1301afd7dfa69d3 +%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 - -# -# Patch to send halt signal to qemu-system-or32 process when RTEMS terminates -# -#%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 +%hash sha256 qemu-4.1.0-leon3.patch \ + d62ff3418903f1c5eb7f6d727af0400caeb250e23cc120111930601c9ecce02a # # The Qemu build instructions. We use 4.x.x Release 1. -- cgit v1.2.3