Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (1cef4437c6808e98fc3987cda541cd94a4fbdee8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (1cef4437c6808e98fc3987cda541cd94a4fbdee8)
  • Date: Thu, 17 Nov 2011 23:36:45 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

dev/null |binary
kernels/kvm/BUILD | 1
kernels/kvm/DEPENDS | 2
kernels/kvm/DETAILS | 2
kernels/kvm/HISTORY | 8 +++
kernels/kvm/PRE_BUILD | 3 -
kernels/kvm/archs | 73
++++++++++++++++++---------------
kernels/kvm/pci.patch | 61 ---------------------------
kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig | 0
kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig |binary
10 files changed, 53 insertions(+), 97 deletions(-)

New commits:
commit 1cef4437c6808e98fc3987cda541cd94a4fbdee8
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kvm: => 0.15.1
DEPENDS: added depend pcituils
BUILD: removed --kerneldir configure option, no longer valid
PRE_BUILD: remove pci.patch, no longer needed
pci.patch: removed
archs: updated with archs list from qemu spel

diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
index f5a155f..21b18db 100755
--- a/kernels/kvm/BUILD
+++ b/kernels/kvm/BUILD
@@ -4,7 +4,6 @@ message "Target list: $KVM_ARCHS" &&
--sysconfdir=${INSTALL_ROOT}/etc \
--extra-cflags="${CFLAGS}" \
--extra-ldflags="${LDFLAGS}" \
- --kerneldir="/lib/modules/$(get_kernel_version)/build" \
--disable-werror \
--disable-xen \
--target-list="$KVM_ARCHS" \
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index 939a72b..2956a7c 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -1,3 +1,5 @@
+depends pciutils &&
+
optional_depends sdl \
'' \
'--disable-sdl' \
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index d737908..4602cbd 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=kvm
- VERSION=0.14.0
+ VERSION=0.15.1
SOURCE=qemu-${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qemu-${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index c1e74c1..a0798b8 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,11 @@
+2011-11-17 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.1
+ * DEPENDS: added depend pcituils
+ * BUILD: removed --kerneldir configure option, no longer valid
+ * PRE_BUILD: remove pci.patch, no longer needed
+ * pci.patch: removed
+ * archs: updated with archs list from qemu spell
+
2011-09-05 Bor Kraljič <pyrobor AT ver.si>
* BUILD: install config files in /etc

diff --git a/kernels/kvm/PRE_BUILD b/kernels/kvm/PRE_BUILD
index 54f3f27..bb7310f 100755
--- a/kernels/kvm/PRE_BUILD
+++ b/kernels/kvm/PRE_BUILD
@@ -12,5 +12,4 @@ if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
return 1
fi
fi &&
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/pci.patch
+default_pre_build #&&
diff --git a/kernels/kvm/archs b/kernels/kvm/archs
index 4d0eb1f..a062278 100644
--- a/kernels/kvm/archs
+++ b/kernels/kvm/archs
@@ -1,32 +1,41 @@
-alpha-linux-user alpha on
-i386-linux-user i386 on
-arm-linux-user arm on
-armeb-linux-user armeb on
-cris-linux-user cris on
-m68k-linux-user m68k on
-mips-linux-user mips on
-mipsel-linux-user mipsel on
-ppc-linux-user ppc on
-ppc64-linux-user ppc64 on
-ppc64abi32-linux-user ppc64abi32 on
-sparc-linux-user sparc on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sh4-linux-user sh4 on
-sh4eb-linux-user sh4eb on
-x86_64-linux-user x86_64 on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc64-softmmu ppc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
-mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips64-softmmu mips64-softmmu on
-mips64el-softmmu mips64el-softmmu on
-arm-softmmu arm-softmmu on
-m68k-softmmu m68k-softmmu on
-cris-softmmu cris-softmmu on
-sh4-softmmu sh4-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
+alpha-linux-user alpha on
+armeb-linux-user armeb on
+arm-linux-user arm on
+cris-linux-user cris on
+i386-linux-user i386 on
+m68k-linux-user m68k on
+microblazeel-linux-user microblazeel on
+microblaze-linux-user microblaze on
+mipsel-linux-user mipsel on
+mips-linux-user mips on
+ppc64abi32-linux-user ppc64abi32 on
+ppc64-linux-user ppc64 on
+ppc-linux-user ppc on
+s390x-linux-user s390x on
+sh4eb-linux-user sh4eb on
+sh4-linux-user sh4 on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sparc-linux-user sparc on
+unicore32-linux-user unicore32 on
+x86_64-linux-user x86_64 on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblazeel-softmmu microblazeel-softmmu on
+microblaze-softmmu microblaze-softmmu on
+mips64el-softmmu mips64el-softmmu on
+mips64-softmmu mips64-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips-softmmu mips-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc-softmmu ppc-softmmu on
+s390x-softmmu s390x-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
+sh4-softmmu sh4-softmmu on
+sparc64-softmmu sparc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
diff --git a/kernels/kvm/pci.patch b/kernels/kvm/pci.patch
deleted file mode 100644
index 9e897a7..0000000
--- a/kernels/kvm/pci.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ac360f5441282f0bd1061654776bb11a2db91a5b Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka AT siemens.com>
-Date: Wed, 23 Feb 2011 09:28:53 +0100
-Subject: [PATCH] qemu-kvm: Fix non-PCI target build
-
-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 AT siemens.com>
-Signed-off-by: Avi Kivity <avi AT redhat.com>
-(cherry picked from commit cf3a3feb8d6309a5c79277fc084d7785729b7262)
----
- 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 a647c45..37dea57 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 9680cc4..e3caa53 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 7792aa9..2f4a0fa 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"
---
-1.7.4.1
-
diff --git a/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
deleted file mode 100644
index 2948adc..0000000
Binary files a/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig
new file mode 100644
index 0000000..a5808bc
Binary files /dev/null and b/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (1cef4437c6808e98fc3987cda541cd94a4fbdee8), Sukneet Basuta, 11/18/2011

Archive powered by MHonArc 2.6.24.

Top of Page