The package rpms/qemu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=3758f8a137bb6....
Change:
-%ifarch %{power64}
Thanks.
Full change:
============
commit 3758f8a137bb625b3f1255438de8b82734bf759d
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Thu Mar 22 11:31:08 2018 -0400
Some spec cleanups
- Sort system-* in alphabetical order
- Remove a bunch of whitespace
- Remove repeated QEMU line in %description
diff --git a/qemu.spec b/qemu.spec
index 6cedffd..c689541 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -315,11 +315,7 @@ Requires(post): /usr/sbin/useradd
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-
%description common
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
This package provides the common files needed by all QEMU targets
@@ -339,11 +335,7 @@ Summary: QEMU guest agent
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-
%description guest-agent
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
This package provides an agent to run inside guests, which communicates
with the host over a virtio-serial channel named "org.qemu.guest_agent.0"
@@ -352,15 +344,19 @@ This package does not need to be installed on the host OS.
%package img
Summary: QEMU command line tool for manipulating disk images
-
%description img
This package provides a command line tool for manipulating disk images
+%package -n ivshmem-tools
+Summary: Client and server for QEMU ivshmem device
+%description -n ivshmem-tools
+This package provides client and server tools for QEMU's ivshmem device.
+
+
%package block-curl
Summary: QEMU CURL block driver
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-curl
This package provides the additional CURL block driver for QEMU.
@@ -371,7 +367,6 @@ http, https, ftp and other transports provided by the CURL library.
%package block-dmg
Summary: QEMU block driver for DMG disk images
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-dmg
This package provides the additional DMG block driver for QEMU.
@@ -381,7 +376,6 @@ Install this package if you want to open '.dmg' files.
%package block-gluster
Summary: QEMU Gluster block driver
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-gluster
This package provides the additional Gluster block driver for QEMU.
@@ -391,7 +385,6 @@ Install this package if you want to access remote Gluster storage.
%package block-iscsi
Summary: QEMU iSCSI block driver
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-iscsi
This package provides the additional iSCSI block driver for QEMU.
@@ -411,7 +404,6 @@ Install this package if you want to access remote NFS storage.
%package block-rbd
Summary: QEMU Ceph/RBD block driver
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-rbd
This package provides the additional Ceph/RBD block driver for QEMU.
@@ -422,7 +414,6 @@ using the rbd protocol.
%package block-ssh
Summary: QEMU SSH block driver
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
%description block-ssh
This package provides the additional SSH block driver for QEMU.
@@ -474,18 +465,10 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
This package provides the additional SDL UI for QEMU.
-%package -n ivshmem-tools
-Summary: Client and server for QEMU ivshmem device
-
-%description -n ivshmem-tools
-This package provides client and server tools for QEMU's ivshmem device.
-
-
%if %{have_kvm}
%package kvm
Summary: QEMU metapackage for KVM support
Requires: qemu-%{kvm_package} = %{epoch}:%{version}-%{release}
-
%description kvm
This is a meta-package that provides a qemu-system-<arch> package for native
architectures where kvm can be enabled. For example, in an x86 system, this
@@ -495,7 +478,6 @@ will install qemu-system-x86
%package kvm-core
Summary: QEMU metapackage for KVM support
Requires: qemu-%{kvm_package}-core = %{epoch}:%{version}-%{release}
-
%description kvm-core
This is a meta-package that provides a qemu-system-<arch>-core package
for native architectures where kvm can be enabled. For example, in an
@@ -508,11 +490,7 @@ Summary: QEMU user mode emulation of qemu targets
Requires: %{name}-common = %{epoch}:%{version}-%{release}
# On upgrade, make qemu-user get replaced with qemu-user + qemu-user-binfmt
Obsoletes: %{name}-user < 2:2.6.0-5%{?dist}
-
%description user
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
This package provides the user mode emulation of qemu targets
@@ -525,11 +503,7 @@ Requires(postun): systemd-units
Conflicts: %{name}-user-static
# On upgrade, make qemu-user get replaced with qemu-user + qemu-user-binfmt
Obsoletes: %{name}-user < 2:2.6.0-5%{?dist}
-
%description user-binfmt
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
This package provides the user mode emulation of qemu targets
%if %{user_static}
@@ -541,48 +515,27 @@ Requires(postun): systemd-units
# qemu-user-binfmt + qemu-user-static both provide binfmt rules
Conflicts: %{name}-user-binfmt
Provides: %{name}-user-binfmt
-
%description user-static
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
This package provides the user mode emulation of qemu targets built as
static binaries
%endif
-%package system-x86
-Summary: QEMU system emulator for x86
-Requires: %{name}-system-x86-core = %{epoch}:%{version}-%{release}
+%package system-aarch64
+Summary: QEMU system emulator for AArch64
+Requires: %{name}-system-aarch64-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
+%description system-aarch64
+This package provides the QEMU system emulator for AArch64.
-%description system-x86
-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 x86. When being run in a x86
-machine that supports it, this package also provides the KVM virtualization
-platform.
-
-
-%package system-x86-core
-Summary: QEMU system emulator for x86
+%package system-aarch64-core
+Summary: QEMU system emulator for AArch64
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: seabios-bin
-Requires: sgabios-bin
-Requires: seavgabios-bin
%if 0%{?have_edk2:1}
-Requires: edk2-ovmf
+Requires: edk2-aarch64
%endif
-
-
-%description system-x86-core
-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 x86. When being run in a x86
-machine that supports it, this package also provides the KVM virtualization
-platform.
+%description system-aarch64-core
+This package provides the QEMU system emulator for AArch64.
%package system-alpha
@@ -590,19 +543,13 @@ Summary: QEMU system emulator for Alpha
Requires: %{name}-system-alpha-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-alpha
-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 Alpha systems.
+This package provides the QEMU system emulator for Alpha systems.
%package system-alpha-core
Summary: QEMU system emulator for Alpha
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-alpha-core
-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 Alpha systems.
+This package provides the QEMU system emulator for Alpha systems.
%package system-arm
@@ -610,39 +557,13 @@ Summary: QEMU system emulator for ARM
Requires: %{name}-system-arm-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-arm
-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 systems.
+This package provides the QEMU system emulator for ARM systems.
%package system-arm-core
Summary: QEMU system emulator for ARM
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-arm-core
-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 boards.
-
-
-%package system-mips
-Summary: QEMU system emulator for MIPS
-Requires: %{name}-system-mips-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%description system-mips
-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 MIPS systems.
-
-%package system-mips-core
-Summary: QEMU system emulator for MIPS
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-mips-core
-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 MIPS boards.
+This package provides the QEMU system emulator for ARM boards.
%package system-cris
@@ -650,39 +571,41 @@ Summary: QEMU system emulator for CRIS
Requires: %{name}-system-cris-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-cris
-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 CRIS systems.
%package system-cris-core
Summary: QEMU system emulator for CRIS
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-cris-core
-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 CRIS boards.
+%package system-hppa
+Summary: QEMU system emulator for HPPA
+Requires: %{name}-system-hppa-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-hppa
+This package provides the QEMU system emulator for HPPA.
+
+%package system-hppa-core
+Summary: QEMU system emulator for hppa
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description system-hppa-core
+This package provides the QEMU system emulator for HPPA.
+
+
%package system-lm32
Summary: QEMU system emulator for LatticeMico32
Requires: %{name}-system-lm32-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-lm32
-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 LatticeMico32 systems.
+This package provides the QEMU system emulator for LatticeMico32 boards.
%package system-lm32-core
-Summary: QEMU system emulator for LatticeMico32
+Summary: QEMU system emulator for LatticsMico32
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-lm32-core
-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 LatticeMico32 boards.
+This package provides the QEMU system emulator for LatticeMico32 boards.
%package system-m68k
@@ -690,19 +613,13 @@ Summary: QEMU system emulator for ColdFire (m68k)
Requires: %{name}-system-m68k-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-m68k
-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 ColdFire boards.
+This package provides the QEMU system emulator for ColdFire boards.
%package system-m68k-core
Summary: QEMU system emulator for ColdFire (m68k)
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-m68k-core
-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 ColdFire boards.
+This package provides the QEMU system emulator for ColdFire boards.
%package system-microblaze
@@ -710,19 +627,55 @@ Summary: QEMU system emulator for Microblaze
Requires: %{name}-system-microblaze-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-microblaze
-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 Microblaze boards.
+This package provides the QEMU system emulator for Microblaze boards.
%package system-microblaze-core
Summary: QEMU system emulator for Microblaze
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-microblaze-core
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
+This package provides the QEMU system emulator for Microblaze boards.
+
+
+%package system-mips
+Summary: QEMU system emulator for MIPS
+Requires: %{name}-system-mips-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-mips
+This package provides the QEMU system emulator for MIPS systems.
+
+%package system-mips-core
+Summary: QEMU system emulator for MIPS
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description system-mips-core
+This package provides the QEMU system emulator for MIPS systems.
+
+
+%package system-moxie
+Summary: QEMU system emulator for Moxie
+Requires: %{name}-system-moxie-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-moxie
+This package provides the QEMU system emulator for Moxie boards.
+
+%package system-moxie-core
+Summary: QEMU system emulator for Moxie
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description system-moxie-core
+This package provides the QEMU system emulator for Moxie boards.
+
+
+%package system-nios2
+Summary: QEMU system emulator for nios2
+Requires: %{name}-system-nios2-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-nios2
+This package provides the QEMU system emulator for NIOS2.
-This package provides the system emulator for Microblaze boards.
+%package system-nios2-core
+Summary: QEMU system emulator for nios2
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description system-nios2-core
+This package provides the QEMU system emulator for NIOS2.
%package system-or1k
@@ -731,20 +684,31 @@ Requires: %{name}-system-or1k-core = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-system-or32 < 2:2.9.0
%{requires_all_modules}
%description system-or1k
-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 OpenRisc32 boards.
+This package provides the QEMU system emulator for OpenRisc32 boards.
%package system-or1k-core
Summary: QEMU system emulator for OpenRisc32
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-system-or32-core < 2:2.9.0
%description system-or1k-core
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
+This package provides the QEMU system emulator for OpenRisc32 boards.
-This package provides the system emulator for OpenRisc32 boards.
+
+%package system-ppc
+Summary: QEMU system emulator for PPC
+Requires: %{name}-system-ppc-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-ppc
+This package provides the QEMU system emulator for PPC and PPC64 systems.
+
+%package system-ppc-core
+Summary: QEMU system emulator for PPC
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: openbios
+Requires: SLOF
+Requires: seavgabios-bin
+%description system-ppc-core
+This package provides the QEMU system emulator for PPC and PPC64 systems.
%package system-riscv
@@ -752,19 +716,13 @@ Summary: QEMU system emulator for RISC-V
Requires: %{name}-system-riscv-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-riscv
-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 RISC-V systems.
+This package provides the QEMU system emulator for RISC-V systems.
%package system-riscv-core
Summary: QEMU system emulator for RISC-V
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-riscv-core
-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 RISC-V systems.
+This package provides the QEMU system emulator for RISC-V systems.
%package system-s390x
@@ -772,19 +730,13 @@ Summary: QEMU system emulator for S390
Requires: %{name}-system-s390x-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-s390x
-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 S390 systems.
+This package provides the QEMU system emulator for S390 systems.
%package system-s390x-core
Summary: QEMU system emulator for S390
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-s390x-core
-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 S390 systems.
+This package provides the QEMU system emulator for S390 systems.
%package system-sh4
@@ -792,19 +744,13 @@ Summary: QEMU system emulator for SH4
Requires: %{name}-system-sh4-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-sh4
-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 SH4 boards.
+This package provides the QEMU system emulator for SH4 boards.
%package system-sh4-core
Summary: QEMU system emulator for SH4
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-sh4-core
-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 SH4 boards.
+This package provides the QEMU system emulator for SH4 boards.
%package system-sparc
@@ -812,126 +758,14 @@ Summary: QEMU system emulator for SPARC
Requires: %{name}-system-sparc-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-sparc
-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 SPARC and SPARC64 systems.
+This package provides the QEMU system emulator for SPARC and SPARC64 systems.
%package system-sparc-core
Summary: QEMU system emulator for SPARC
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: openbios
%description system-sparc-core
-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 SPARC and SPARC64 systems.
-
-
-%package system-ppc
-Summary: QEMU system emulator for PPC
-Requires: %{name}-system-ppc-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%description system-ppc
-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 PPC and PPC64 systems.
-
-%package system-ppc-core
-Summary: QEMU system emulator for PPC
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: openbios
-Requires: SLOF
-Requires: seavgabios-bin
-%description system-ppc-core
-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 PPC and PPC64 systems.
-
-
-%package system-xtensa
-Summary: QEMU system emulator for Xtensa
-Requires: %{name}-system-xtensa-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%description system-xtensa
-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 Xtensa boards.
-
-%package system-xtensa-core
-Summary: QEMU system emulator for Xtensa
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-xtensa-core
-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 Xtensa boards.
-
-
-%package system-unicore32
-Summary: QEMU system emulator for Unicore32
-Requires: %{name}-system-unicore32-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%description system-unicore32
-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 Unicore32 boards.
-
-%package system-unicore32-core
-Summary: QEMU system emulator for Unicore32
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-unicore32-core
-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 Unicore32 boards.
-
-
-%package system-moxie
-Summary: QEMU system emulator for Moxie
-Requires: %{name}-system-moxie-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%description system-moxie
-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 Moxie boards.
-
-%package system-moxie-core
-Summary: QEMU system emulator for Moxie
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-moxie-core
-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 Moxie boards.
-
-
-%package system-aarch64
-Summary: QEMU system emulator for AArch64
-Requires: %{name}-system-aarch64-core = %{epoch}:%{version}-%{release}
-%{requires_all_modules}
-%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 AArch64.
-
-%package system-aarch64-core
-Summary: QEMU system emulator for AArch64
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%if 0%{?have_edk2:1}
-Requires: edk2-aarch64
-%endif
-%description system-aarch64-core
-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 AArch64.
+This package provides the QEMU system emulator for SPARC and SPARC64 systems.
%package system-tricore
@@ -939,61 +773,65 @@ Summary: QEMU system emulator for tricore
Requires: %{name}-system-tricore-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
%description system-tricore
-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 Tricore.
+This package provides the QEMU system emulator for Tricore.
%package system-tricore-core
Summary: QEMU system emulator for tricore
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description system-tricore-core
-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 Tricore.
+This package provides the QEMU system emulator for Tricore.
-%package system-nios2
-Summary: QEMU system emulator for nios2
-Requires: %{name}-system-nios2-core = %{epoch}:%{version}-%{release}
+%package system-unicore32
+Summary: QEMU system emulator for Unicore32
+Requires: %{name}-system-unicore32-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
-%description system-nios2
-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 NIOS2.
+%description system-unicore32
+This package provides the QEMU system emulator for Unicore32 boards.
-%package system-nios2-core
-Summary: QEMU system emulator for nios2
+%package system-unicore32-core
+Summary: QEMU system emulator for Unicore32
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-nios2-core
-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 NIOS2.
+%description system-unicore32-core
+This package provides the QEMU system emulator for Unicore32 boards.
-%package system-hppa
-Summary: QEMU system emulator for HPPA
-Requires: %{name}-system-hppa-core = %{epoch}:%{version}-%{release}
+%package system-x86
+Summary: QEMU system emulator for x86
+Requires: %{name}-system-x86-core = %{epoch}:%{version}-%{release}
%{requires_all_modules}
-%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 for HPPA.
+%description system-x86
+This package provides the QEMU system emulator for x86. When being run in a x86
+machine that supports it, this package also provides the KVM virtualization
+platform.
-%package system-hppa-core
-Summary: QEMU system emulator for hppa
+%package system-x86-core
+Summary: QEMU system emulator for x86
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%description system-hppa-core
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
+Requires: seabios-bin
+Requires: sgabios-bin
+Requires: seavgabios-bin
+%if 0%{?have_edk2:1}
+Requires: edk2-ovmf
+%endif
+%description system-x86-core
+This package provides the QEMU system emulator for x86. When being run in a x86
+machine that supports it, this package also provides the KVM virtualization
+platform.
-This package provides the system emulator for HPPA.
+%package system-xtensa
+Summary: QEMU system emulator for Xtensa
+Requires: %{name}-system-xtensa-core = %{epoch}:%{version}-%{release}
+%{requires_all_modules}
+%description system-xtensa
+This package provides the QEMU system emulator for Xtensa boards.
+%package system-xtensa-core
+Summary: QEMU system emulator for Xtensa
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description system-xtensa-core
+This package provides the QEMU system emulator for Xtensa boards.
@@ -1841,34 +1679,14 @@ getent passwd qemu >/dev/null || \
%endif
-%files system-x86
-# Deliberately empty
-
-%files system-x86-core
-%{_bindir}/qemu-system-i386
-%{_bindir}/qemu-system-x86_64
-%{_datadir}/systemtap/tapset/qemu-system-i386*.stp
-%{_datadir}/systemtap/tapset/qemu-system-x86_64*.stp
-%{_mandir}/man1/qemu-system-i386.1*
-%{_mandir}/man1/qemu-system-x86_64.1*
-
-%if 0%{?need_qemu_kvm}
-%{_bindir}/qemu-kvm
-%{_mandir}/man1/qemu-kvm.1*
-%endif
-
-%{_datadir}/%{name}/bios.bin
-%{_datadir}/%{name}/bios-256k.bin
-%{_datadir}/%{name}/sgabios.bin
-%{_datadir}/%{name}/linuxboot.bin
-%{_datadir}/%{name}/linuxboot_dma.bin
-%{_datadir}/%{name}/multiboot.bin
-%{_datadir}/%{name}/kvmvapic.bin
+%files system-aarch64
+%files system-aarch64-core
+%{_bindir}/qemu-system-aarch64
+%{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp
+%{_mandir}/man1/qemu-system-aarch64.1*
%files system-alpha
-# Deliberately empty
-
%files system-alpha-core
%{_bindir}/qemu-system-alpha
%{_datadir}/systemtap/tapset/qemu-system-alpha*.stp
@@ -1877,41 +1695,28 @@ getent passwd qemu >/dev/null || \
%files system-arm
-# Deliberately empty
-
%files system-arm-core
%{_bindir}/qemu-system-arm
%{_datadir}/systemtap/tapset/qemu-system-arm*.stp
%{_mandir}/man1/qemu-system-arm.1*
-%files system-mips
-# Deliberately empty
-
-%files system-mips-core
-%{_bindir}/qemu-system-mips
-%{_bindir}/qemu-system-mipsel
-%{_bindir}/qemu-system-mips64
-%{_bindir}/qemu-system-mips64el
-%{_datadir}/systemtap/tapset/qemu-system-mips*.stp
-%{_mandir}/man1/qemu-system-mips.1*
-%{_mandir}/man1/qemu-system-mipsel.1*
-%{_mandir}/man1/qemu-system-mips64el.1*
-%{_mandir}/man1/qemu-system-mips64.1*
-
-
%files system-cris
-# Deliberately empty
-
%files system-cris-core
%{_bindir}/qemu-system-cris
%{_datadir}/systemtap/tapset/qemu-system-cris*.stp
%{_mandir}/man1/qemu-system-cris.1*
-%files system-lm32
-# Deliberately empty
+%files system-hppa
+%files system-hppa-core
+%{_bindir}/qemu-system-hppa
+%{_datadir}/systemtap/tapset/qemu-system-hppa*.stp
+%{_mandir}/man1/qemu-system-hppa.1*
+%{_datadir}/%{name}/hppa-firmware.img
+
+%files system-lm32
%files system-lm32-core
%{_bindir}/qemu-system-lm32
%{_datadir}/systemtap/tapset/qemu-system-lm32*.stp
@@ -1919,8 +1724,6 @@ getent passwd qemu >/dev/null || \
%files system-m68k
-# Deliberately empty
-
%files system-m68k-core
%{_bindir}/qemu-system-m68k
%{_datadir}/systemtap/tapset/qemu-system-m68k*.stp
@@ -1928,8 +1731,6 @@ getent passwd qemu >/dev/null || \
%files system-microblaze
-# Deliberately empty
-
%files system-microblaze-core
%{_bindir}/qemu-system-microblaze
%{_bindir}/qemu-system-microblazeel
@@ -1939,18 +1740,63 @@ getent passwd qemu >/dev/null || \
%{_datadir}/%{name}/petalogix*.dtb
-%files system-or1k
-# Deliberately empty
+%files system-mips
+%files system-mips-core
+%{_bindir}/qemu-system-mips
+%{_bindir}/qemu-system-mipsel
+%{_bindir}/qemu-system-mips64
+%{_bindir}/qemu-system-mips64el
+%{_datadir}/systemtap/tapset/qemu-system-mips*.stp
+%{_mandir}/man1/qemu-system-mips.1*
+%{_mandir}/man1/qemu-system-mipsel.1*
+%{_mandir}/man1/qemu-system-mips64el.1*
+%{_mandir}/man1/qemu-system-mips64.1*
+
+%files system-moxie
+%files system-moxie-core
+%{_bindir}/qemu-system-moxie
+%{_datadir}/systemtap/tapset/qemu-system-moxie*.stp
+%{_mandir}/man1/qemu-system-moxie.1*
+
+
+%files system-nios2
+%files system-nios2-core
+%{_bindir}/qemu-system-nios2
+%{_datadir}/systemtap/tapset/qemu-system-nios2*.stp
+%{_mandir}/man1/qemu-system-nios2.1*
+
+
+%files system-or1k
%files system-or1k-core
%{_bindir}/qemu-system-or1k
%{_datadir}/systemtap/tapset/qemu-system-or1k*.stp
%{_mandir}/man1/qemu-system-or1k.1*
-%files system-riscv
-# Deliberately empty
+%files system-ppc
+%files system-ppc-core
+%{_bindir}/qemu-system-ppc
+%{_bindir}/qemu-system-ppc64
+%{_bindir}/qemu-system-ppcemb
+%{_datadir}/systemtap/tapset/qemu-system-ppc*.stp
+%{_mandir}/man1/qemu-system-ppc.1*
+%{_mandir}/man1/qemu-system-ppc64.1*
+%{_mandir}/man1/qemu-system-ppcemb.1*
+%{_datadir}/%{name}/bamboo.dtb
+%{_datadir}/%{name}/canyonlands.dtb
+%{_datadir}/%{name}/ppc_rom.bin
+%{_datadir}/%{name}/qemu_vga.ndrv
+%{_datadir}/%{name}/skiboot.lid
+%{_datadir}/%{name}/spapr-rtas.bin
+%{_datadir}/%{name}/u-boot.e500
+%{_datadir}/%{name}/u-boot-sam460-20100605.bin
+%ifarch %{power64}
+%{_sysconfdir}/security/limits.d/95-kvm-ppc64-memlock.conf
+%endif
+
+%files system-riscv
%files system-riscv-core
%{_bindir}/qemu-system-riscv32
%{_bindir}/qemu-system-riscv64
@@ -1959,8 +1805,6 @@ getent passwd qemu >/dev/null || \
%files system-s390x
-# Deliberately empty
-
%files system-s390x-core
%{_bindir}/qemu-system-s390x
%{_datadir}/systemtap/tapset/qemu-system-s390x*.stp
@@ -1973,8 +1817,6 @@ getent passwd qemu >/dev/null || \
%files system-sh4
-# Deliberately empty
-
%files system-sh4-core
%{_bindir}/qemu-system-sh4
%{_bindir}/qemu-system-sh4eb
@@ -1984,8 +1826,6 @@ getent passwd qemu >/dev/null || \
%files system-sparc
-# Deliberately empty
-
%files system-sparc-core
%{_bindir}/qemu-system-sparc
%{_bindir}/qemu-system-sparc64
@@ -1996,42 +1836,42 @@ getent passwd qemu >/dev/null || \
%{_datadir}/%{name}/QEMU,cgthree.bin
-%files system-ppc
-# Deliberately empty
-
-%files system-ppc-core
-%{_bindir}/qemu-system-ppc
-%{_bindir}/qemu-system-ppc64
-%{_bindir}/qemu-system-ppcemb
-%{_datadir}/systemtap/tapset/qemu-system-ppc*.stp
-%{_mandir}/man1/qemu-system-ppc.1*
-%{_mandir}/man1/qemu-system-ppc64.1*
-%{_mandir}/man1/qemu-system-ppcemb.1*
-%{_datadir}/%{name}/bamboo.dtb
-%{_datadir}/%{name}/canyonlands.dtb
-%{_datadir}/%{name}/ppc_rom.bin
-%{_datadir}/%{name}/qemu_vga.ndrv
-%{_datadir}/%{name}/skiboot.lid
-%{_datadir}/%{name}/spapr-rtas.bin
-%{_datadir}/%{name}/u-boot.e500
-%{_datadir}/%{name}/u-boot-sam460-20100605.bin
-%ifarch %{power64}
-%{_sysconfdir}/security/limits.d/95-kvm-ppc64-memlock.conf
-%endif
+%files system-tricore
+%files system-tricore-core
+%{_bindir}/qemu-system-tricore
+%{_datadir}/systemtap/tapset/qemu-system-tricore*.stp
+%{_mandir}/man1/qemu-system-tricore.1*
%files system-unicore32
-# Deliberately empty
-
%files system-unicore32-core
%{_bindir}/qemu-system-unicore32
%{_datadir}/systemtap/tapset/qemu-system-unicore32*.stp
%{_mandir}/man1/qemu-system-unicore32.1*
-%files system-xtensa
-# Deliberately empty
+%files system-x86
+%files system-x86-core
+%{_bindir}/qemu-system-i386
+%{_bindir}/qemu-system-x86_64
+%{_datadir}/systemtap/tapset/qemu-system-i386*.stp
+%{_datadir}/systemtap/tapset/qemu-system-x86_64*.stp
+%{_mandir}/man1/qemu-system-i386.1*
+%{_mandir}/man1/qemu-system-x86_64.1*
+%{_datadir}/%{name}/bios.bin
+%{_datadir}/%{name}/bios-256k.bin
+%{_datadir}/%{name}/sgabios.bin
+%{_datadir}/%{name}/linuxboot.bin
+%{_datadir}/%{name}/linuxboot_dma.bin
+%{_datadir}/%{name}/multiboot.bin
+%{_datadir}/%{name}/kvmvapic.bin
+%if 0%{?need_qemu_kvm}
+%{_bindir}/qemu-kvm
+%{_mandir}/man1/qemu-kvm.1*
+%endif
+
+%files system-xtensa
%files system-xtensa-core
%{_bindir}/qemu-system-xtensa
%{_bindir}/qemu-system-xtensaeb
@@ -2040,52 +1880,6 @@ getent passwd qemu >/dev/null || \
%{_mandir}/man1/qemu-system-xtensaeb.1*
-%files system-moxie
-# Deliberately empty
-
-%files system-moxie-core
-%{_bindir}/qemu-system-moxie
-%{_datadir}/systemtap/tapset/qemu-system-moxie*.stp
-%{_mandir}/man1/qemu-system-moxie.1*
-
-
-%files system-aarch64
-# Deliberately empty
-
-%files system-aarch64-core
-%{_bindir}/qemu-system-aarch64
-%{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp
-%{_mandir}/man1/qemu-system-aarch64.1*
-
-
-%files system-tricore
-# Deliberately empty
-
-%files system-tricore-core
-%{_bindir}/qemu-system-tricore
-%{_datadir}/systemtap/tapset/qemu-system-tricore*.stp
-%{_mandir}/man1/qemu-system-tricore.1*
-
-
-%files system-nios2
-# Deliberately empty
-
-%files system-nios2-core
-%{_bindir}/qemu-system-nios2
-%{_datadir}/systemtap/tapset/qemu-system-nios2*.stp
-%{_mandir}/man1/qemu-system-nios2.1*
-
-
-%files system-hppa
-# Deliberately empty
-
-%files system-hppa-core
-%{_bindir}/qemu-system-hppa
-%{_datadir}/systemtap/tapset/qemu-system-hppa*.stp
-%{_mandir}/man1/qemu-system-hppa.1*
-%{_datadir}/%{name}/hppa-firmware.img
-
-
%changelog
* Thu Mar 22 2018 Cole Robinson <crobinso(a)redhat.com> - 2:2.12.0-0.1.rc0
- Rebase to qemu-2.12.0-rc0
commit e13261f9471a9a49d62953562ff0c82324b51c1d
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Thu Mar 22 11:07:41 2018 -0400
Fix hppa firmware packaging
Accidentally added it to aarch64
diff --git a/qemu.spec b/qemu.spec
index 441ba32..6cedffd 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -2056,7 +2056,6 @@ getent passwd qemu >/dev/null || \
%{_bindir}/qemu-system-aarch64
%{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp
%{_mandir}/man1/qemu-system-aarch64.1*
-%{_datadir}/%{name}/hppa-firmware.img
%files system-tricore
@@ -2084,6 +2083,7 @@ getent passwd qemu >/dev/null || \
%{_bindir}/qemu-system-hppa
%{_datadir}/systemtap/tapset/qemu-system-hppa*.stp
%{_mandir}/man1/qemu-system-hppa.1*
+%{_datadir}/%{name}/hppa-firmware.img
%changelog