summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2014-11-06 08:46:41 +1100
committerChris Johns <chrisj@rtems.org>2014-11-06 08:46:41 +1100
commita0a5b1ca8de74502a891c87dedb6bb0aebdbd12c (patch)
treeb71f9e4049b31f5b6f61b9b55bc5ce900c292ecb
parentsb: FreeBSD uses clang for cc on version 10 and later. (diff)
downloadrtems-source-builder-a0a5b1ca8de74502a891c87dedb6bb0aebdbd12c.tar.bz2
bare: Update qemu to the latest version.
Add support to build on FreeBSD 10. The CAN support is broken on a recent qemu and needs updating so has been removed from the build.
-rw-r--r--bare/config/devel/qemu-git-1.cfg15
1 files changed, 11 insertions, 4 deletions
diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg
index 3ca23ac..2c923cf 100644
--- a/bare/config/devel/qemu-git-1.cfg
+++ b/bare/config/devel/qemu-git-1.cfg
@@ -11,7 +11,7 @@
#
# Stable version. Qemu is fast moving.
#
-%define qemu_version 97374ce538883af677fd94803b71df2d55a9a4de
+%define qemu_version d5b4dc3b50175f0c34f3cf4b053e123fb37f5aed
#
# Qemu is from GIT.
@@ -21,9 +21,16 @@
#
# Patches from Qemu's patchworks site.
#
-%patch add qemu pw://patchwork.ozlabs.org/patch/318435/raw/PULL-29-29-arm-zynq-Add-software-system-reset-via-SCLR.patch
-%patch add qemu pw://patchwork.ozlabs.org/patch/347503/raw/CAN-bus-simple-SJA1000-PCI-card-emulation-for-QEMU.patch
-%patch add qemu pw://patchwork.ozlabs.org/patch/347502/raw/CAN-bus-Kvaser-PCI-CAN-S-single-SJA1000-channel-emulation-added.patch
+%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 md5 Provide-the-missing-LIBUSB_LOG_LEVEL_-for-older-libusb-or-FreeBSD.-Providing-just-the-needed-value-as-a-defined..patch 0b1f163808efd1e86ab858053d5df71d
+
+#
+# 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
%if %{_host} == mingw32
%patch add qemu pw://patchwork.ozlabs.org/patch/99999999/raw/qemu-channel-win32-cdecls.patch