- updated to 2.11.0, partial PLD merge

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 286d987860bed7b034700db907445ffd063854b3..451868dfec1433814b4415effe0b9f510e0f986a 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,18 +1,18 @@
-diff -urp qemu-2.6.1.orig/configure qemu-2.6.1/configure
---- qemu-2.6.1.orig/configure  2016-08-22 12:44:02.279554000 +0000
-+++ qemu-2.6.1/configure       2016-08-22 12:44:21.033554000 +0000
-@@ -392,10 +392,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin
+diff -urp qemu-2.11.0.orig/configure qemu-2.11.0/configure
+--- qemu-2.11.0.orig/configure 2018-01-25 00:10:09.335918465 +0000
++++ qemu-2.11.0/configure      2018-01-25 00:11:23.962914017 +0000
+@@ -507,10 +507,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin

  QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
  QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"

- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/accel/tcg -I\$(SRC_PATH)/include"

 -if test "$debug_info" = "yes"; then
 -    CFLAGS="-g $CFLAGS"
 -    LDFLAGS="-g $LDFLAGS"
 -fi
  
  # make source path absolute
 -if test "$debug_info" = "yes"; then
 -    CFLAGS="-g $CFLAGS"
 -    LDFLAGS="-g $LDFLAGS"
 -fi
  
  # make source path absolute

- source_path=`cd "$source_path"; pwd`
-@@ -4514,12 +4510,8 @@ fi
+ source_path=$(cd "$source_path"; pwd)
+@@ -5122,12 +5118,8 @@ fi

  # After here, no more $cc or $ld runs
  
  if test "$gcov" = "yes" ; then
  # After here, no more $cc or $ld runs
  
  if test "$gcov" = "yes" ; then

diff --git a/qemu-whitelist.patch b/qemu-whitelist.patch
index cbfa13f3b26c80519794fb5b6e39c242702c7398..7e04520aff76c2affd918b92ac429733890e05b8 100644 (file)
--- a/qemu-whitelist.patch
+++ b/qemu-whitelist.patch
@@ -1,7 +1,7 @@
-diff -urp qemu-2.6.1.orig/scripts/create_config qemu-2.6.1/scripts/create_config
---- qemu-2.6.1.orig/scripts/create_config      2016-08-22 12:45:39.876554000 +0000
-+++ qemu-2.6.1/scripts/create_config   2016-08-22 12:46:15.281554000 +0000
-@@ -41,7 +41,9 @@ case $line in
+diff -urp qemu-2.11.0.orig/scripts/create_config qemu-2.11.0/scripts/create_config
+--- qemu-2.11.0.orig/scripts/create_config     2018-01-25 00:12:40.172909475 +0000
++++ qemu-2.11.0/scripts/create_config  2018-01-25 00:13:00.521908262 +0000
+@@ -43,7 +43,9 @@ case $line in

   CONFIG_BDRV_RW_WHITELIST=*)
      echo "#define CONFIG_BDRV_RW_WHITELIST\\"
      for drv in ${line#*=}; do
   CONFIG_BDRV_RW_WHITELIST=*)
      echo "#define CONFIG_BDRV_RW_WHITELIST\\"
      for drv in ${line#*=}; do

diff --git a/qemu.spec b/qemu.spec
index 5cde328ee52fd15673e235d5ab946fc22b7ac108..a4a94197cb6a1852cb285901655be68a2196ec75 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -5,7 +5,6 @@
 %bcond_without ceph            # Ceph/RBD support
 %bcond_without glusterfs       # GlusterFS backend
 %bcond_without rdma            # RDMA-based migration support
 %bcond_without ceph            # Ceph/RBD support
 %bcond_without glusterfs       # GlusterFS backend
 %bcond_without rdma            # RDMA-based migration support

-%bcond_with    xseg            # Archipelago backend [non-distributable: GPLv3+ vs GPLv2-only]

 %bcond_with    gtk2            # GTK+ 2.x instead of 3.x
 %bcond_without gtk3            # Do not build GTK+ UI
 %bcond_without vte             # VTE support in GTK+ UI
 %bcond_with    gtk2            # GTK+ 2.x instead of 3.x
 %bcond_without gtk3            # Do not build GTK+ UI
 %bcond_without vte             # VTE support in GTK+ UI


@@ -38,12 +37,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu

-Version:       2.8.0
+Version:       2.11.0

 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators

-Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 17940dce063b6ce450a12e719a6c9c43
+Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
+# Source0-md5: 5c823d2e01934b46a080f9e4d0695805

 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm


@@ -82,7 +81,7 @@ BuildRequires:        libaio-devel
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}

-BuildRequires: libfdt-devel
+BuildRequires: libfdt-devel >= 1.4.2

 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}
 BuildRequires: libjpeg-devel
 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}
 BuildRequires: libjpeg-devel


@@ -93,7 +92,6 @@ BuildRequires:        libpng-devel
 BuildRequires: libssh2-devel >= 1.2.8
 BuildRequires: libusb-devel >= 1.0.13
 BuildRequires: libuuid-devel
 BuildRequires: libssh2-devel >= 1.2.8
 BuildRequires: libusb-devel >= 1.0.13
 BuildRequires: libuuid-devel

-%{?with_xseg:BuildRequires:    libxseg-devel}

 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzo-devel >= 2
 BuildRequires: ncurses-devel
 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzo-devel >= 2
 BuildRequires: ncurses-devel


@@ -135,6 +133,7 @@ BuildRequires:      gtk+3-devel >= 3.0.0
 BuildRequires: glib2-static
 BuildRequires: glibc-static
 BuildRequires: pcre-static
 BuildRequires: glib2-static
 BuildRequires: glibc-static
 BuildRequires: pcre-static

+BuildRequires: xen-static

 BuildRequires: zlib-static
 %endif
 Requires:      %{name}-img = %{version}-%{release}
 BuildRequires: zlib-static
 %endif
 Requires:      %{name}-img = %{version}-%{release}


@@ -147,7 +146,8 @@ Requires:   %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
 Requires:      %{name}-system-moxie = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
 Requires:      %{name}-system-moxie = %{version}-%{release}

-Requires:      %{name}-system-or32 = %{version}-%{release}
+Requires:      %{name}-system-nios2 = %{version}-%{release}
+Requires:      %{name}-system-or1k = %{version}-%{release}

 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}


@@ -164,6 +164,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %if %{with sdl} \
 Requires:      SDL2 \
 %endif \
 %if %{with sdl} \
 Requires:      SDL2 \
 %endif \

+Requires:      libfdt >= 1.4.2 \

 %if %{with seccomp} \
 Requires:      libseccomp >= 2.1.0 \
 %endif \
 %if %{with seccomp} \
 Requires:      libseccomp >= 2.1.0 \
 %endif \


@@ -227,6 +228,7 @@ Requires(pre):      /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      glib2 >= 1:2.22
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      glib2 >= 1:2.22

+%{?with_libnfs:Requires:       libnfs >= 1.9.3}

 Requires:      libssh2 >= 1.2.8
 Provides:      group(qemu)
 Provides:      user(qemu)
 Requires:      libssh2 >= 1.2.8
 Provides:      group(qemu)
 Provides:      user(qemu)


@@ -483,21 +485,41 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem Moxie.
 
 
 Ten pakiet zawiera emulator systemu z procesorem Moxie.
 

-%package system-or32
+%package system-nios2
+Summary:       QEMU system emulator for Nios II
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Nios II
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%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 with Nios II CPU.
+
+%description system-nios2 -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 Nios II.
+
+%package system-or1k

 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
 Group:         Development/Tools
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
 Group:         Development/Tools
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-or32
+Obsoletes:     qemu-kvm-system-or1k
+Obsoletes:     qemu-system-or32

 
 

-%description system-or32
+%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 with OpenRISC CPU.
 
 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 OpenRISC CPU.
 

-%description system-or32 -l pl.UTF-8
+%description system-or1k -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.
 
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 


@@ -687,18 +709,6 @@ systemach-gościach, komunikującego się kanałem virtio-serial o nazwie
 
 Ten pakiet nie musi być zainstalowany w systemie hosta.
 
 
 Ten pakiet nie musi być zainstalowany w systemie hosta.
 

-%package module-block-archipelago
-Summary:       QEMU module for Archipelago block devices
-Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych Archipelago
-Group:         Development/Tools
-Requires:      %{name}-common = %{version}-%{release}
-
-%description module-block-archipelago
-Archipelago block device support for QEMU.
-
-%description module-block-archipelago -l pl.UTF-8
-Moduł QEMU dla urządeń blokowych Archipelago.
-

 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'
 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'


@@ -833,7 +843,6 @@ build() {
 build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
        --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \
 build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
        --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \

-       %{__enable_disable xseg archipelago} \

        --enable-attr \
        %{__enable_disable bluetooth bluez} \
        %{__enable_disable brlapi} \
        --enable-attr \
        %{__enable_disable bluetooth bluez} \
        %{__enable_disable brlapi} \


@@ -853,13 +862,12 @@ build dynamic \
        %{__enable_disable smartcard smartcard} \
        --enable-tpm \
        %{__enable_disable usbredir usb-redir} \
        %{__enable_disable smartcard smartcard} \
        --enable-tpm \
        %{__enable_disable usbredir usb-redir} \

-       --enable-uuid \

        --enable-vde \
        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \
        --enable-vde \
        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \

-       %{!?with_vte:--disable-vte} \
+       %{__enable_disable vte} \

        %{__enable_disable xen} \
        --enable-modules \
        --disable-netmap \
        %{__enable_disable xen} \
        --enable-modules \
        --disable-netmap \


@@ -891,7 +899,6 @@ build static \
        --disable-spice \
        --disable-tcmalloc \
        --disable-tools \
        --disable-spice \
        --disable-tcmalloc \
        --disable-tools \

-       --disable-uuid \

        --enable-user \
        --disable-system \
        --static
        --enable-user \
        --disable-system \
        --static


@@ -905,8 +912,7 @@ build static \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT/usr/lib/binfmt.d \
-       $RPM_BUILD_ROOT/etc/{qemu,sysconfig,udev/rules.d,modules-load.d} \
+install -d $RPM_BUILD_ROOT/etc/{qemu,sysconfig,udev/rules.d,modules-load.d} \

        $RPM_BUILD_ROOT{%{_sysconfdir}/sasl,%{_sbindir}}
 
 %if %{with user_static}
        $RPM_BUILD_ROOT{%{_sysconfdir}/sasl,%{_sbindir}}
 
 %if %{with user_static}


@@ -950,7 +956,6 @@ install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html

-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt

 
 # install patched vesa tables with additional widescreen modes.
 cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin
 
 # install patched vesa tables with additional widescreen modes.
 cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin


@@ -1003,13 +1008,16 @@ fi
 %dir /etc/qemu
 %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper
 %dir /etc/qemu
 %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper

+%attr(755,root,root) %{_bindir}/qemu-keymap

 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_bindir}/qemu-nbd

+%attr(755,root,root) %{_bindir}/qemu-pr-helper

 %attr(755,root,root) %{_bindir}/qemu-tilegx
 %attr(755,root,root) %{_bindir}/qemu-tilegx

-%attr(755,root,root) %{_libdir}/qemu-bridge-helper
+%attr(755,root,root) %{_libexecdir}/qemu-bridge-helper

 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*

+%{_mandir}/man7/qemu-block-drivers.7*

 %{_mandir}/man8/qemu-nbd.8*
 
 %dir %{_datadir}/qemu
 %{_mandir}/man8/qemu-nbd.8*
 
 %dir %{_datadir}/qemu


@@ -1078,6 +1086,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris

+%attr(755,root,root) %{_bindir}/qemu-hppa

 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
 %attr(755,root,root) %{_bindir}/qemu-m68k
 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
 %attr(755,root,root) %{_bindir}/qemu-m68k


@@ -1089,7 +1098,8 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el

-%attr(755,root,root) %{_bindir}/qemu-or32
+%attr(755,root,root) %{_bindir}/qemu-nios2
+%attr(755,root,root) %{_bindir}/qemu-or1k

 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32


@@ -1110,6 +1120,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
 %attr(755,root,root) %{_bindir}/qemu-cris-static
 %attr(755,root,root) %{_bindir}/qemu-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
 %attr(755,root,root) %{_bindir}/qemu-cris-static

+%attr(755,root,root) %{_bindir}/qemu-hppa-static

 %attr(755,root,root) %{_bindir}/qemu-i386-static
 %attr(755,root,root) %{_bindir}/qemu-m68k-static
 %attr(755,root,root) %{_bindir}/qemu-microblaze-static
 %attr(755,root,root) %{_bindir}/qemu-i386-static
 %attr(755,root,root) %{_bindir}/qemu-m68k-static
 %attr(755,root,root) %{_bindir}/qemu-microblaze-static


@@ -1120,7 +1131,8 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static
 %attr(755,root,root) %{_bindir}/qemu-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static

-%attr(755,root,root) %{_bindir}/qemu-or32-static
+%attr(755,root,root) %{_bindir}/qemu-nios2-static
+%attr(755,root,root) %{_bindir}/qemu-or1k-static

 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32-static
 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32-static


@@ -1175,9 +1187,13 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-moxie
 
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-moxie
 

-%files system-or32
+%files system-nios2

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_bindir}/qemu-system-or32
+%attr(755,root,root) %{_bindir}/qemu-system-nios2
+
+%files system-or1k
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-or1k

 
 %files system-ppc
 %defattr(644,root,root,755)
 
 %files system-ppc
 %defattr(644,root,root,755)


@@ -1185,11 +1201,13 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-ppc64
 #%attr(755,root,root) %{_bindir}/qemu-system-ppc64le
 %attr(755,root,root) %{_bindir}/qemu-system-ppcemb
 %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}/qemu_vga.ndrv

 %{_datadir}/%{name}/u-boot.e500
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
 %{_datadir}/%{name}/u-boot.e500
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x

+%{_datadir}/%{name}/s390-netboot.img

 
 %files system-sh4
 %defattr(644,root,root,755)
 
 %files system-sh4
 %defattr(644,root,root,755)


@@ -1232,12 +1250,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-ga
 %{_mandir}/man8/qemu-ga.8*
 
 %attr(755,root,root) %{_bindir}/qemu-ga
 %{_mandir}/man8/qemu-ga.8*
 

-%if %{with xseg}
-%files module-block-archipelago
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/block-archipelago.so
-%endif
-

 %files module-block-curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so
 %files module-block-curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so