diff -Nru qemu-2.5+dfsg/debian/changelog qemu-2.5+dfsg/debian/changelog --- qemu-2.5+dfsg/debian/changelog 2016-04-11 20:16:02.000000000 +0000 +++ qemu-2.5+dfsg/debian/changelog 2016-04-19 20:41:37.000000000 +0000 @@ -1,3 +1,24 @@ +qemu (1:2.5+dfsg-5ubuntu10) xenial; urgency=medium + + * qemu-system-s390x only available on s390x, so qemu-system should only + depend on it on this arch. + * have qemu-system-aarch64 Suggest: qemu-efi; this should be a stronger + relationship, but qemu-efi is still in universe right now. + + -- Steve Langasek Tue, 19 Apr 2016 13:41:37 -0700 + +qemu (1:2.5+dfsg-5ubuntu9) xenial; urgency=medium + + * And actually ship the right things in qemu-system-s390x. + + -- Dimitri John Ledkov Tue, 19 Apr 2016 16:49:00 +0100 + +qemu (1:2.5+dfsg-5ubuntu8) xenial; urgency=medium + + * Create qemu-system-s390x package on ubuntu only. + + -- Dimitri John Ledkov Mon, 18 Apr 2016 10:16:19 +0100 + qemu (1:2.5+dfsg-5ubuntu7) xenial; urgency=medium * Cherrypick patch from mailing list to fix qemu in sandbox. (LP: #1560149) diff -Nru qemu-2.5+dfsg/debian/control qemu-2.5+dfsg/debian/control --- qemu-2.5+dfsg/debian/control 2016-03-16 23:37:25.000000000 +0000 +++ qemu-2.5+dfsg/debian/control 2016-04-19 20:40:53.000000000 +0000 @@ -146,6 +146,7 @@ qemu-system-ppc, qemu-system-sparc, qemu-system-x86, + qemu-system-s390x [s390x], qemu-system-misc Description: QEMU full system emulation binaries QEMU is a fast processor emulator: currently the package supports @@ -510,14 +511,15 @@ qemu virtual machine. It is not used on the host. Package: qemu-kvm -Architecture: i386 amd64 x32 armhf armel arm64 powerpc ppc64 ppc64el +Architecture: i386 amd64 x32 armhf armel arm64 powerpc ppc64 ppc64el s390x Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, qemu-system-x86 (= ${binary:Version}) [i386 amd64 x32], qemu-system-arm (= ${binary:Version}) [armhf armel arm64], - qemu-system-ppc (= ${binary:Version}) [powerpc ppc64 ppc64el] + qemu-system-ppc (= ${binary:Version}) [powerpc ppc64 ppc64el], + qemu-system-s390x (= ${binary:Version}) [s390x] Provides: kvm, qemu-kvm-spice Conflicts: kvm, @@ -538,6 +540,7 @@ Architecture: arm64 Multi-Arch: foreign Depends: ${misc:Depends}, qemu-system-arm (>= 2.0~git-20140403.de03c31-0ubuntu2) +Suggests: qemu-efi Description: QEMU full system emulation binaries (aarch64) QEMU is a fast processor emulator: currently the package supports ARM emulation. By using dynamic translation it achieves @@ -545,3 +548,25 @@ . This is a transition package as qemu-system-aarch64 has been moved into qemu-system-arm. + +Package: qemu-system-s390x +Architecture: s390x +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-8~), +Recommends: qemu-utils, +Suggests: qemu-block-extra (= ${binary:Version}), +Provides: ${sysprovides:s390x} +Breaks: qemu-system-misc (<< 1:2.5+dfsg-5ubuntu8~) +Replaces: qemu-system-misc (<< 1:2.5+dfsg-5ubuntu8~) +Description: QEMU full system emulation binaries (s390x) + QEMU is a fast processor emulator: currently the package supports + s390x emulation. By using dynamic translation it achieves reasonable + speed while being easy to port on new host CPUs. + . + This package provides the full system emulation binaries to emulate + the following s390x hardware: ${sysarch:s390x}. + . + In system emulation mode QEMU emulates a full system, including a processor + and various peripherals. It enables easier testing and debugging of system + code. It can also be used to provide virtual hosting of several virtual + machines on a single server. diff -Nru qemu-2.5+dfsg/debian/control-in qemu-2.5+dfsg/debian/control-in --- qemu-2.5+dfsg/debian/control-in 2016-03-15 23:16:54.000000000 +0000 +++ qemu-2.5+dfsg/debian/control-in 2016-04-19 20:40:15.000000000 +0000 @@ -156,6 +156,7 @@ qemu-system-ppc, qemu-system-sparc, qemu-system-x86, +:ubuntu: qemu-system-s390x [s390x], qemu-system-misc Description: QEMU full system emulation binaries QEMU is a fast processor emulator: currently the package supports @@ -524,14 +525,15 @@ Package: qemu-kvm :debian:Architecture: i386 amd64 -:ubuntu:Architecture: i386 amd64 x32 armhf armel arm64 powerpc ppc64 ppc64el +:ubuntu:Architecture: i386 amd64 x32 armhf armel arm64 powerpc ppc64 ppc64el s390x Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, qemu-system-x86 (= ${binary:Version}) [i386 amd64 x32], qemu-system-arm (= ${binary:Version}) [armhf armel arm64], - qemu-system-ppc (= ${binary:Version}) [powerpc ppc64 ppc64el] + qemu-system-ppc (= ${binary:Version}) [powerpc ppc64 ppc64el], +:ubuntu: qemu-system-s390x (= ${binary:Version}) [s390x] Provides: kvm, :ubuntu: qemu-kvm-spice Conflicts: kvm, @@ -552,6 +554,7 @@ :ubuntu:Architecture: arm64 :ubuntu:Multi-Arch: foreign :ubuntu:Depends: ${misc:Depends}, qemu-system-arm (>= 2.0~git-20140403.de03c31-0ubuntu2) +:ubuntu:Suggests: qemu-efi :ubuntu:Description: QEMU full system emulation binaries (aarch64) :ubuntu: QEMU is a fast processor emulator: currently the package supports :ubuntu: ARM emulation. By using dynamic translation it achieves @@ -559,3 +562,25 @@ :ubuntu: . :ubuntu: This is a transition package as qemu-system-aarch64 has been moved into :ubuntu: qemu-system-arm. + +:ubuntu:Package: qemu-system-s390x +:ubuntu:Architecture: s390x +:ubuntu:Multi-Arch: foreign +:ubuntu:Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-8~), +:ubuntu:Recommends: qemu-utils, +:ubuntu:Suggests: qemu-block-extra (= ${binary:Version}), +:ubuntu:Provides: ${sysprovides:s390x} +:ubuntu:Breaks: qemu-system-misc (<< 1:2.5+dfsg-5ubuntu8~) +:ubuntu:Replaces: qemu-system-misc (<< 1:2.5+dfsg-5ubuntu8~) +:ubuntu:Description: QEMU full system emulation binaries (s390x) +:ubuntu: QEMU is a fast processor emulator: currently the package supports +:ubuntu: s390x emulation. By using dynamic translation it achieves reasonable +:ubuntu: speed while being easy to port on new host CPUs. +:ubuntu: . +:ubuntu: This package provides the full system emulation binaries to emulate +:ubuntu: the following s390x hardware: ${sysarch:s390x}. +:ubuntu: . +:ubuntu: In system emulation mode QEMU emulates a full system, including a processor +:ubuntu: and various peripherals. It enables easier testing and debugging of system +:ubuntu: code. It can also be used to provide virtual hosting of several virtual +:ubuntu: machines on a single server. diff -Nru qemu-2.5+dfsg/debian/rules qemu-2.5+dfsg/debian/rules --- qemu-2.5+dfsg/debian/rules 2016-03-15 23:16:54.000000000 +0000 +++ qemu-2.5+dfsg/debian/rules 2016-04-19 15:48:46.000000000 +0000 @@ -61,13 +61,14 @@ sparc sparc64 s390x tricore xtensa xtensaeb unicore32 # qemu-system subpackages, from d/control -sys_systems = arm mips ppc sparc x86 +sys_systems = arm mips ppc sparc x86 s390x systems = ${sys_systems} misc sysarch_arm = $(filter aarch64 arm,${system_targets}) sysarch_mips = $(filter mips mipsel mips64 mips64el,${system_targets}) sysarch_ppc = $(filter ppc ppc64 ppcemb,${system_targets}) sysarch_sparc = $(filter sparc sparc64,${system_targets}) sysarch_x86 = $(filter i386 x86_64,${system_targets}) +sysarch_s390x = $(filter s390x,${system_targets}) sysarch_misc = $(filter-out $(foreach s,${sys_systems},${sysarch_$s}),${system_targets}) else @@ -223,7 +224,7 @@ install -D -m755 debian/kvm.powerpc debian/qemu-kvm/usr/bin/kvm endif ifneq ($(filter $(DEB_HOST_ARCH),s390 s390x),) - install -D -m755 qemu-build/pc-bios/s390-ccw/s390-ccw.img debian/qemu-system-misc/usr/share/qemu/s390-ccw.img + install -D -m755 qemu-build/pc-bios/s390-ccw/s390-ccw.img debian/qemu-system-s390x/usr/share/qemu/s390-ccw.img endif ifeq ($(VENDOR),UBUNTU)