diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-06-20 10:31:51 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-06-20 10:31:51 -0500 |
| commit | 60cc063109cff4b4f6682ebfc0e70a9f913b42d8 (patch) | |
| tree | 3ba3c6cf7cc93173b8728b064d220a2fa94f14b2 | |
| parent | config: Add a qemu-snapshot map to the qemu build. (diff) | |
| download | rtems-source-builder-60cc063109cff4b4f6682ebfc0e70a9f913b42d8.tar.bz2 | |
qemu: Bump git version and disable stack protection
Stack protection must be disabled (--disable-stack-protection) must
be disabled to avoid bugs in older toolsets. If this can be made
conditional somehow, it is supposed to be needed on CentOS 5 and 6.
There are at least two patches in Qemu Patchworks which are supposed
to fix this but they do not fix it.
http://patchwork.ozlabs.org/patch/394826/
https://patchwork.ozlabs.org/patch/410493/
The bump in the git version is an update to ensure all patches
that might be related to this issue which have been committed
were used. But apparently none were. The bump also avoids a period
where "make install" did not work on CentOS 7 due to a missing BIOS
file. This was likely a failure in all host environments.
| -rw-r--r-- | bare/config/devel/qemu-git-1.cfg | 2 | ||||
| -rw-r--r-- | source-builder/config/qemu-1-1.cfg | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg index 88e346c..531ec3c 100644 --- a/bare/config/devel/qemu-git-1.cfg +++ b/bare/config/devel/qemu-git-1.cfg @@ -13,7 +13,7 @@ # # Stable version. Qemu is fast moving. # -%define qemu_version 42d58e7c6760cb9c55627c28ae538e27dcf2f144 +%define qemu_version 799810fb2810ec4cb82f12ec9b023e1bfe434d71 # # Qemu is from GIT. diff --git a/source-builder/config/qemu-1-1.cfg b/source-builder/config/qemu-1-1.cfg index cbf14fb..8d6de91 100644 --- a/source-builder/config/qemu-1-1.cfg +++ b/source-builder/config/qemu-1-1.cfg @@ -76,6 +76,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) --make=%{__make} \ ${VDE_CONFIG} \ --disable-werror \ + --disable-stack-protector \ --disable-tools \ --disable-pie \ --disable-vnc \ |