diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/qemu-kvm/fixup-undefined-pci-references.patch | 51 | ||||
| -rw-r--r-- | system/qemu-kvm/qemu-kvm.SlackBuild | 11 | ||||
| -rw-r--r-- | system/qemu-kvm/qemu-kvm.info | 8 | ||||
| -rw-r--r-- | system/qemu-kvm/slack-desc | 2 |
4 files changed, 8 insertions, 64 deletions
diff --git a/system/qemu-kvm/fixup-undefined-pci-references.patch b/system/qemu-kvm/fixup-undefined-pci-references.patch deleted file mode 100644 index 4a002c7bf2..0000000000 --- a/system/qemu-kvm/fixup-undefined-pci-references.patch +++ /dev/null @@ -1,51 +0,0 @@ -Replace obsolete qemu-kvm.h with kvm.h in pci.c and build that module -just like upstream does. This fixes non-x86 targets which have no PCI -support. - -Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> ---- - Makefile.objs | 2 +- - Makefile.target | 2 +- - hw/pci.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.objs b/Makefile.objs -index f5702eb..3ec7121 100644 ---- a/Makefile.objs -+++ b/Makefile.objs -@@ -170,7 +170,7 @@ hw-obj-y = - hw-obj-y += loader.o - hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o - hw-obj-y += fw_cfg.o --hw-obj-$(CONFIG_PCI) += pci_bridge.o -+hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o - hw-obj-$(CONFIG_PCI) += msix.o msi.o - hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o - hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o -diff --git a/Makefile.target b/Makefile.target -index 6e9a024..23367eb 100644 ---- a/Makefile.target -+++ b/Makefile.target -@@ -195,7 +195,7 @@ endif #CONFIG_BSD_USER - # System emulator target - ifdef CONFIG_SOFTMMU - --obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o balloon.o -+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o - # virtio has to be here due to weird dependency between PCI and virtio-net. - # need to fix this properly - obj-$(CONFIG_NO_PCI) += pci-stub.o -diff --git a/hw/pci.c b/hw/pci.c -index 0c44939..1f6cebe 100644 ---- a/hw/pci.c -+++ b/hw/pci.c -@@ -29,8 +29,8 @@ - #include "net.h" - #include "sysemu.h" - #include "loader.h" --#include "qemu-kvm.h" - #include "hw/pc.h" -+#include "kvm.h" - #include "device-assignment.h" - #include "qemu-objects.h" - #include "range.h" diff --git a/system/qemu-kvm/qemu-kvm.SlackBuild b/system/qemu-kvm/qemu-kvm.SlackBuild index 7902c6f218..a724972160 100644 --- a/system/qemu-kvm/qemu-kvm.SlackBuild +++ b/system/qemu-kvm/qemu-kvm.SlackBuild @@ -22,8 +22,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qemu-kvm -VERSION=${VERSION:-0.14.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.15.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KVMGROUP=${KVMGROUP:-kvm} @@ -92,11 +92,6 @@ find . \ # group to be used (no real need to require a kvm group) patch -p1 < $CWD/fixup_udev_rules.patch -# Replace obsolete qemu-kvm.h with kvm.h in pci.c and build that module -# just like upstream does. This fixes non-x86 targets which have no PCI -# support. http://www.mail-archive.com/kvm@vger.kernel.org/msg50038.html -patch -p1 < $CWD/fixup-undefined-pci-references.patch - # This translates the possible targets into the correct format for configure TARGETS="$(for i in $BUILD_ARCH ; do printf "$i-softmmu " ; done)" @@ -109,7 +104,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-system \ --target-list="$TARGETS" -make \ +make V=1 \ mandir=/usr/man \ docdir=/usr/doc/$PRGNAM-$VERSION make install \ diff --git a/system/qemu-kvm/qemu-kvm.info b/system/qemu-kvm/qemu-kvm.info index 2fdfb16d8f..1fef9a7084 100644 --- a/system/qemu-kvm/qemu-kvm.info +++ b/system/qemu-kvm/qemu-kvm.info @@ -1,10 +1,10 @@ PRGNAM="qemu-kvm" -VERSION="0.14.0" +VERSION="0.15.0" HOMEPAGE="http://www.linux-kvm.org/page/Main_Page" -DOWNLOAD="http://downloads.sourceforge.net/kvm/qemu-kvm-0.14.0.tar.gz" -MD5SUM="4ea6f412d85a826e0b0690f5c4c59f13" +DOWNLOAD="http://downloads.sourceforge.net/kvm/qemu-kvm-0.15.0.tar.gz" +MD5SUM="b45b0deebba4ce47dcaaab3807f6ed47" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Stu Miller" EMAIL="slackbuilds@go4it2day.com" -APPROVED="rworkman" +APPROVED="rworkman,Niels Horn" diff --git a/system/qemu-kvm/slack-desc b/system/qemu-kvm/slack-desc index 52c2c6bb42..d1175e12f1 100644 --- a/system/qemu-kvm/slack-desc +++ b/system/qemu-kvm/slack-desc @@ -5,7 +5,7 @@ # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - |-----handy-ruler--------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| qemu-kvm: qemu-kvm (Stable branch - KVM requires QEMU) qemu-kvm: qemu-kvm: KVM (Kernel-based Virtual Machine) is a full virtualization solution |