summaryrefslogtreecommitdiffstats
path: root/bare/config/devel
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2020-05-08 14:28:45 +1000
committerChris Johns <chrisj@rtems.org>2020-05-08 14:33:44 +1000
commit955c1c173e02e2ed62fe1cc11b13733700e99bcb (patch)
treef3ba7d81f128313981454797f6ad77709b0ff68c /bare/config/devel
parentsb: Disable any trace data (diff)
downloadrtems-source-builder-955c1c173e02e2ed62fe1cc11b13733700e99bcb.tar.bz2
bare/qemu: Fixes building on FreeBSD
- Move the qemu config to a common file shared by qemu and qemu4. - Disable nettle on qemu4, FreeBSd complained. - Add some extra git cleaning steps to the git path. These however do not full clean the qemu submodules and it is not worth the effort to try and fix. - The devel/qemu will not build on machines with python set to python3. This will not be fixed, use qemu4. Closes #3966
Diffstat (limited to 'bare/config/devel')
-rw-r--r--bare/config/devel/pixman-0.32.4-1.cfg2
-rw-r--r--bare/config/devel/qemu-git-1.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/bare/config/devel/pixman-0.32.4-1.cfg b/bare/config/devel/pixman-0.32.4-1.cfg
index a5aef16..5c572d0 100644
--- a/bare/config/devel/pixman-0.32.4-1.cfg
+++ b/bare/config/devel/pixman-0.32.4-1.cfg
@@ -8,7 +8,7 @@
%include %{_configdir}/base.cfg
-%define pixman_version 0.32.4
+%define pixman_version 0.40.0
%hash sha256 pixman-0.32.4.tar.gz 80c7ed420e8a3ae749800241e6347c3d55681296cab71384be7969cd9e657e84
#
diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg
index a12799f..5333303 100644
--- a/bare/config/devel/qemu-git-1.cfg
+++ b/bare/config/devel/qemu-git-1.cfg
@@ -23,7 +23,7 @@
%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
+ %source set qemu git://git.qemu-project.org/qemu.git?clean=force?pull?checkout=%{qemu_version}?submodule=dtc
%endif
#