Attachment 885757 Details for Bug 1087005 – add rc2 and aarch64 support

[patch] add rc2 and aarch64 support

patch (text/plain), 5.58 KB, created by solanum on 2014-04-12 17:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: solanum

Created: 2014-04-12 17:26:18 UTC

Size: 5.58 KB

patch

obsolete

>Common subdirectories: qemu.org/.git and qemu/.git
>diff -u qemu.org/qemu.binfmt qemu/qemu.binfmt
>--- qemu.org/qemu.binfmt	2014-04-12 12:23:16.625163026 -0400
>+++ qemu/qemu.binfmt	2014-04-12 12:12:39.000907898 -0400
>@@ -1,6 +1,7 @@
> :qemu-alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:
> :qemu-armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:
> :qemu-arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:
>+:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-aarch64:
> :qemu-cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris:
> :qemu-i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:
> :qemu-i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:
>diff -u qemu.org/qemu.spec qemu/qemu.spec
>--- qemu.org/qemu.spec	2014-04-12 12:23:16.627163058 -0400
>+++ qemu/qemu.spec	2014-04-12 12:11:28.538753921 -0400
>@@ -115,6 +115,7 @@
> %global user          user
> %global system_alpha  system-alpha
> %global system_arm    system-arm
>+%global system_aarch64    system-aarch64
> %global system_cris   system-cris
> %global system_lm32   system-lm32
> %global system_m68k   system-m68k
>@@ -147,7 +148,7 @@
> Summary: QEMU is a FAST! processor emulator
> Name: qemu
> Version: 2.0.0
>-Release: 0.2.rc0%{?dist}
>+Release: 0.2.rc2%{?dist}
> Epoch: 2
> License: GPLv2+ and LGPLv2+ and BSD
> Group: Development/Tools
>@@ -163,7 +164,7 @@
> %endif
> 
> #Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
>-Source0: http://wiki.qemu-project.org/download/%{name}-%{version}-rc0.tar.bz2
>+Source0: http://wiki.qemu-project.org/download/%{name}-%{version}-rc2.tar.bz2
> 
> Source1: qemu.binfmt
> 
>@@ -193,7 +194,7 @@
> Patch0001: 0001-Change-gtk-quit-accelerator-to-ctrl-shift-q-bz-10623.patch
> # Fix mouse with spice
> # Patches queued for 2.0
>-Patch0002: 0002-spice-input-Fix-absolute-mouse-y-coordinates.patch
>+#Patch0002: 0002-spice-input-Fix-absolute-mouse-y-coordinates.patch
> 
> BuildRequires: SDL2-devel
> BuildRequires: zlib-devel
>@@ -300,6 +301,9 @@
> %if 0%{?system_arm:1}
> Requires: %{name}-%{system_arm} = %{epoch}:%{version}-%{release}
> %endif
>+%if 0%{?system_aarch64:1}
>+Requires: %{name}-%{system_arm} = %{epoch}:%{version}-%{release}
>+%endif
> %if 0%{?system_cris:1}
> Requires: %{name}-%{system_cris} = %{epoch}:%{version}-%{release}
> %endif
>@@ -502,6 +506,18 @@
> This package provides the system emulator for ARM boards.
> %endif
> 
>+%if 0%{?system_aarch64:1}
>+%package %{system_aarch64}
>+Summary: QEMU system emulator for ARM 64-bit
>+Group: Development/Tools
>+Requires: %{name}-common = %{epoch}:%{version}-%{release}
>+%description %{system_aarch64}
>+QEMU is a generic and open source processor emulator which achieves a good
>+emulation speed by using dynamic translation.
>+
>+This package provides the system emulator for ARM 64-bit boards.
>+%endif
>+
> %if 0%{?system_mips:1}
> %package %{system_mips}
> Summary: QEMU system emulator for MIPS
>@@ -698,21 +714,21 @@
> 
> 
> %prep
>-%setup -q -n qemu-2.0.0-rc0
>+%setup -q -n qemu-2.0.0-rc2
> 
> # Change gtk quit accelerator to ctrl+shift+q (bz #1062393)
> # Patches queued for 2.1
> %patch0001 -p1
> # Fix mouse with spice
> # Patches queued for 2.0
>-%patch0002 -p1
>+#%patch0002 -p1
> 
> 
> %build
> %if %{with kvmonly}
>     buildarch="%{kvm_target}-softmmu"
> %else
>-    buildarch="i386-softmmu x86_64-softmmu alpha-softmmu arm-softmmu \
>+    buildarch="aarch64-softmmu i386-softmmu x86_64-softmmu alpha-softmmu arm-softmmu \
>     cris-softmmu lm32-softmmu m68k-softmmu microblaze-softmmu \
>     microblazeel-softmmu mips-softmmu mipsel-softmmu mips64-softmmu \
>     mips64el-softmmu or32-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu \
>@@ -931,7 +947,7 @@
> %if 0%{?user:1}
> mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d
> for i in dummy \
>-%ifnarch %{ix86} x86_64
>+%ifnarch %{ix86}=x86_64
>     qemu-i386 \
> %endif
> %ifnarch alpha
>@@ -940,6 +956,9 @@
> %ifnarch %{arm}
>     qemu-arm \
> %endif
>+%ifnarch %{aarch64}
>+    qemu-aarch64 \
>+%endif
>     qemu-armeb \
>     qemu-cris \
>     qemu-microblaze qemu-microblazeel \
>@@ -965,10 +984,10 @@
>     qemu-sh4 \
> %endif
>     qemu-sh4eb \
>-; do
>-  test $i = dummy && continue
>-  grep /$i:\$ %{SOURCE1} > $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d/$i.conf
>-  chmod 644 $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d/$i.conf
>+;do
>+   test $i = dummy && continue
>+   grep /$i:\$ %{SOURCE1} > $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d/$i.conf
>+   chmod 644 $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d/$i.conf
> done < %{SOURCE1}
> %endif
> 
>@@ -1278,6 +1297,21 @@
> %{?kvm_files:}
> %{?qemu_kvm_files:}
> %endif
>+%endif
>+
>+%endif
>+
>+%if 0%{?system_aarch64:1}
>+%files %{system_aarch64}
>+%defattr(-,root,root)
>+%{_bindir}/qemu-system-aarch64
>+%{_datadir}/systemtap/tapset/qemu-system-aarch64.stp
>+%{_mandir}/man1/qemu-system-aarch64.1*
>+%if %{without separate_kvm}
>+%ifarch aarch64
>+%{?kvm_files:}
>+%{?qemu_kvm_files:}
>+%endif
> %endif
> 
> %endif

Actions: View | Diff

Attachments on bug 1087005: 885757