From 1777be9303adb619f2ff67bbc70b6270b2cabf3c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Mon, 30 Apr 2018 19:33:31 +0200 Subject: [PATCH] up to 2.12.0 (rel 0.1 user-execve patch needs update) - glibc patch no longer needed - packaged -system-{hppa,riscv32,riscv64} - audio/ui functionality externalized into independent modules, packaged in common not to break current user installations --- qemu-glibc2_27.patch | 55 ----------------------- qemu.spec | 105 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 97 insertions(+), 63 deletions(-) delete mode 100644 qemu-glibc2_27.patch diff --git a/qemu-glibc2_27.patch b/qemu-glibc2_27.patch deleted file mode 100644 index b1f354a..0000000 --- a/qemu-glibc2_27.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a..99ccc17 100755 ---- a/configure -+++ b/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1a..412e94a 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -1.8.3.1 - diff --git a/qemu.spec b/qemu.spec index 1cb0ab5..2c3e43e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -37,12 +37,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 2.11.1 -Release: 1 +Version: 2.12.0 +Release: 0.1 License: GPL v2 Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz -# Source0-md5: 0ee48c0f0cae47cc5d05408e03cd199e +# Source0-md5: ca553eb04c933f58111c304452fc4cc5 Source2: %{name}.binfmt # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf @@ -64,7 +64,6 @@ Patch3: %{name}-user-execve.patch Patch4: %{name}-xattr.patch Patch5: libjpeg-boolean.patch Patch6: x32.patch -Patch7: %{name}-glibc2_27.patch URL: http://www.qemu-project.org/ %{?with_gl:BuildRequires: OpenGL-GLX-devel} %{?with_gl:BuildRequires: OpenGL-devel} @@ -89,6 +88,7 @@ BuildRequires: libcap-ng-devel BuildRequires: libfdt-devel >= 1.4.2 %{?with_rdma:BuildRequires: libibverbs-devel} %{?with_iscsi:BuildRequires: libiscsi-devel >= 1.9.0} +%{?with_rdma:BuildRequires: libibumad-devel} BuildRequires: libjpeg-devel %{?with_libnfs:BuildRequires: libnfs-devel >= 1.9.3} BuildRequires: libpng-devel @@ -145,6 +145,7 @@ Requires: %{name}-system-aarch64 = %{version}-%{release} Requires: %{name}-system-alpha = %{version}-%{release} Requires: %{name}-system-arm = %{version}-%{release} Requires: %{name}-system-cris = %{version}-%{release} +Requires: %{name}-system-hppa = %{version}-%{release} Requires: %{name}-system-lm32 = %{version}-%{release} Requires: %{name}-system-m68k = %{version}-%{release} Requires: %{name}-system-microblaze = %{version}-%{release} @@ -153,6 +154,8 @@ Requires: %{name}-system-moxie = %{version}-%{release} Requires: %{name}-system-nios2 = %{version}-%{release} Requires: %{name}-system-or1k = %{version}-%{release} Requires: %{name}-system-ppc = %{version}-%{release} +Requires: %{name}-system-riscv32 = %{version}-%{release} +Requires: %{name}-system-riscv64 = %{version}-%{release} Requires: %{name}-system-s390x = %{version}-%{release} Requires: %{name}-system-sh4 = %{version}-%{release} Requires: %{name}-system-sparc = %{version}-%{release} @@ -383,6 +386,25 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. Ten pakiet zawiera emulator systemu z procesorem CRIS. +%package system-hppa +Summary: QEMU system emulator for HP/PA +Summary(pl.UTF-8): QEMU - emulator systemu z procesorem HP/PA +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} +%systempkg_req + +%description system-hppa +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 with HP/PA CPU. + +%description system-hppa -l pl.UTF-8 +QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający +dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. + +Ten pakiet zawiera emulator systemu z procesorem HP/PA. + %package system-lm32 Summary: QEMU system emulator for LM32 Summary(pl.UTF-8): QEMU - emulator systemu z procesorem LM32 @@ -542,6 +564,44 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. Ten pakiet zawiera emulator systemu z procesorem PowerPC. +%package system-riscv32 +Summary: QEMU system emulator for RISC-V (32 bit) +Summary(pl.UTF-8): QEMU - emulator systemu z procesorem RISC-V (32 bit) +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} +%systempkg_req + +%description system-riscv32 +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 with RISC-V (32 bit) CPU. + +%description system-riscv32 -l pl.UTF-8 +QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający +dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. + +Ten pakiet zawiera emulator systemu z procesorem RISC-V (32 bit). + +%package system-riscv64 +Summary: QEMU system emulator for RISC-V (64 bit) +Summary(pl.UTF-8): QEMU - emulator systemu z procesorem RISC-V (64 bit) +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} +%systempkg_req + +%description system-riscv64 +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 with RISC-V (64 bit) CPU. + +%description system-riscv64 -l pl.UTF-8 +QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający +dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. + +Ten pakiet zawiera emulator systemu z procesorem RISC-V (64 bit). + %package system-s390x Summary: QEMU system emulator for S390 Summary(pl.UTF-8): QEMU - emulator systemu z procesorem S390 @@ -775,11 +835,10 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'. %patch0 -p1 %patch1 -p1 %patch2 -p0 -%patch3 -p1 +#%%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 # workaround for conflict with alsa/error.h ln -s ../error.h qapi/error.h @@ -1143,6 +1202,13 @@ fi %attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so %attr(755,root,root) %{_libdir}/%{name}/block-nfs.so +%attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so +%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so +%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so +%attr(755,root,root) %{_libdir}/%{name}/ui-curses.so +%attr(755,root,root) %{_libdir}/%{name}/ui-gtk.so +%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so + %files img %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-img @@ -1152,6 +1218,7 @@ fi %defattr(644,root,root,755) /usr/lib/binfmt.d/qemu-*-dynamic.conf %attr(755,root,root) %{_bindir}/qemu-aarch64 +%attr(755,root,root) %{_bindir}/qemu-aarch64_be %attr(755,root,root) %{_bindir}/qemu-alpha %attr(755,root,root) %{_bindir}/qemu-arm %attr(755,root,root) %{_bindir}/qemu-armeb @@ -1174,6 +1241,8 @@ fi %attr(755,root,root) %{_bindir}/qemu-ppc64 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32 %attr(755,root,root) %{_bindir}/qemu-ppc64le +%attr(755,root,root) %{_bindir}/qemu-riscv32 +%attr(755,root,root) %{_bindir}/qemu-riscv64 %attr(755,root,root) %{_bindir}/qemu-s390x %attr(755,root,root) %{_bindir}/qemu-sh4 %attr(755,root,root) %{_bindir}/qemu-sh4eb @@ -1181,12 +1250,15 @@ fi %attr(755,root,root) %{_bindir}/qemu-sparc32plus %attr(755,root,root) %{_bindir}/qemu-sparc64 %attr(755,root,root) %{_bindir}/qemu-x86_64 +%attr(755,root,root) %{_bindir}/qemu-xtensa +%attr(755,root,root) %{_bindir}/qemu-xtensaeb %if %{with user_static} %files user-static %defattr(644,root,root,755) /usr/lib/binfmt.d/qemu-*-static.conf %attr(755,root,root) %{_bindir}/qemu-aarch64-static +%attr(755,root,root) %{_bindir}/qemu-aarch64_be-static %attr(755,root,root) %{_bindir}/qemu-alpha-static %attr(755,root,root) %{_bindir}/qemu-arm-static %attr(755,root,root) %{_bindir}/qemu-armeb-static @@ -1208,6 +1280,8 @@ fi %attr(755,root,root) %{_bindir}/qemu-ppc64-static %attr(755,root,root) %{_bindir}/qemu-ppc64abi32-static %attr(755,root,root) %{_bindir}/qemu-ppc64le-static +%attr(755,root,root) %{_bindir}/qemu-riscv32-static +%attr(755,root,root) %{_bindir}/qemu-riscv64-static %attr(755,root,root) %{_bindir}/qemu-s390x-static %attr(755,root,root) %{_bindir}/qemu-sh4-static %attr(755,root,root) %{_bindir}/qemu-sh4eb-static @@ -1216,6 +1290,8 @@ fi %attr(755,root,root) %{_bindir}/qemu-sparc64-static %attr(755,root,root) %{_bindir}/qemu-tilegx-static %attr(755,root,root) %{_bindir}/qemu-x86_64-static +%attr(755,root,root) %{_bindir}/qemu-xtensa-static +%attr(755,root,root) %{_bindir}/qemu-xtensaeb-static %endif %files system-aarch64 @@ -1234,6 +1310,11 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-cris +%files system-hppa +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/qemu-system-hppa +%{_datadir}/%{name}/hppa-firmware.img + %files system-lm32 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-lm32 @@ -1270,10 +1351,19 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-ppc %attr(755,root,root) %{_bindir}/qemu-system-ppc64 -#%attr(755,root,root) %{_bindir}/qemu-system-ppc64le %attr(755,root,root) %{_bindir}/qemu-system-ppcemb +%{_datadir}/%{name}/canyonlands.dtb %{_datadir}/%{name}/qemu_vga.ndrv %{_datadir}/%{name}/u-boot.e500 +%{_datadir}/%{name}/u-boot-sam460-20100605.bin + +%files system-riscv32 +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/qemu-system-riscv32 + +%files system-riscv64 +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/qemu-system-riscv64 %files system-s390x %defattr(644,root,root,755) @@ -1308,7 +1398,6 @@ fi %endif %{_datadir}/%{name}/bios.bin %{_datadir}/%{name}/bios-256k.bin -%{_datadir}/%{name}/acpi-dsdt.aml %files system-xtensa %defattr(644,root,root,755) -- 2.44.0