packages: kvm/kvm-kernel-release.patch, kvm/kvm.spec - up to 86-1; updated ...

mguevara mguevara at pld-linux.org
Sat Jun 20 22:04:08 CEST 2009 

Author: mguevara                     Date: Sat Jun 20 20:04:08 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 86-1; updated kvm-kernel-release.patch; moved qemu-nbd to the
  internal_qemu bcond to eliminate conflicts between kvm and qemu packages;
  userland builds and works fine (tested with kernel-2.6.28.9-3.x86_64); 
  added some notes about source structure changes.

---- Files affected:
packages/kvm:
   kvm-kernel-release.patch (1.1 -> 1.2) , kvm.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: packages/kvm/kvm-kernel-release.patch
diff -u packages/kvm/kvm-kernel-release.patch:1.1 packages/kvm/kvm-kernel-release.patch:1.2
--- packages/kvm/kvm-kernel-release.patch:1.1	Wed Dec 17 01:04:07 2008
+++ packages/kvm/kvm-kernel-release.patch	Sat Jun 20 22:04:02 2009
@@ -1,15 +1,18 @@
---- kvm-81/configure.orig	2008-12-14 14:16:27.000000000 +0100
-+++ kvm-81/configure	2008-12-17 00:56:42.841973719 +0100
-@@ -119,21 +119,6 @@
+--- kvm-86/kvm/kernel/configure.orig	2009-05-20 15:59:56.000000000 +0200
++++ kvm-86/kvm/kernel/configure	2009-06-18 00:21:45.000000000 +0200
+@@ -94,24 +94,6 @@ if [ -d "$kerneldir/include2" ]; then
      kernelsourcedir=${kerneldir%/*}/source
  fi
  
--if [ -n "$no_uname" ]; then
+-if [ -n "$no_uname" -a "$want_module" ]; then
 -    if [ -e "$kerneldir/.kernelrelease" ]; then
 -        depmod_version=`cat "$kerneldir/.kernelrelease"`
 -
 -    elif [ -e "$kerneldir/include/config/kernel.release" ]; then
 -            depmod_version=`cat "$kerneldir/include/config/kernel.release"`
+-    elif [ -e "$kerneldir/.config" ]; then
+-	depmod_version=$(awk '/Linux kernel version:/ { print $NF }' \
+-			 "$kerneldir/.config")
 -    else
 -        echo
 -        echo "Error: kernelversion not found"
@@ -19,6 +22,6 @@
 -    fi
 -fi
 -
- #configure user dir
- (cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir" \
-           --arch="$arch" --processor="$processor" \
+ rm -f include/asm include-compat/asm
+ mkdir -p include
+ ln -sf asm-"$karch" include/asm

================================================================
Index: packages/kvm/kvm.spec
diff -u packages/kvm/kvm.spec:1.81 packages/kvm/kvm.spec:1.82
--- packages/kvm/kvm.spec:1.81	Mon Mar 16 23:59:22 2009
+++ packages/kvm/kvm.spec	Sat Jun 20 22:04:02 2009
@@ -1,7 +1,14 @@
 # $Revision$, $Date$
 # TODO:
-# - add groupadd/remove for group kvm for udev rules.
-# - file /usr/bin/qemu-nbd from install of qemu-0.10.0-2k.i686 conflicts with file from package kvm-75-1.i686
+# - add groupadd/remove for group kvm for udev rules 
+#   or add the kvm group to the setup package.
+# - kernel part - doesn't build now, but should we care in the HEAD?
+#   btw. with kernel bcond we require >= 3:2.6.28 kernels which 
+#   could have the kvm stuff on its own
+# NOTE:
+# - as of 86 the source structure have changed comparing to 75 or 81
+#   it looks like kvm is going to be merged with qemu, so in this
+#   release the kvm is a subdirectory of the main qemu stuff
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
@@ -30,12 +37,12 @@
 Summary(pl.UTF-8):	Oparta na jądrze maszyna wirtualna dla Linuksa
 Name:		%{pname}%{_alt_kernel}
 # http://kvm.qumranet.com/kvmwiki/choose_the_right_kvm_%26_kernel_version
-Version:	81
+Version:	86
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/kvm/%{pname}-%{version}.tar.gz
-# Source0-md5:	499f1856d30aa72ef872becaea684f49
+# Source0-md5:	cd8cc78c56ddaaf0be421919f8a6835c
 Patch0:		%{pname}-fixes.patch
 Patch1:		%{pname}-kernel-release.patch
 URL:		http://kvm.qumranet.com/kvmwiki
@@ -50,6 +57,7 @@
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	perl-tools-pod
+BuildRequires:	texi2html
 BuildRequires:	rpm-pythonprov
 BuildRequires:	tetex
 BuildRequires:	zlib-devel
@@ -64,8 +72,8 @@
 ExclusiveArch:	%{ix86} %{x8664} ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# some SPARC boot image in ELF format
-%define         _noautostrip .*%{_datadir}/qemu/openbios-sparc.*
+# some SPARC (and PPC) boot image in ELF format
+%define         _noautostrip .*%{_datadir}/qemu/openbios-.*
 
 %ifarch %{ix86}
 %define carch i386
@@ -147,56 +155,66 @@
 %build
 %if %{without kernel}
 # qemu/configure uses linux/kvm.h to detect available features (KVM_CAP_* defs).
-rm -r kernel/include/*
-ln -s %{_kernelsrcdir}/include/linux kernel/include
-ln -s %{_kernelsrcdir}/arch/%{karch}/include/asm kernel/include
+rm -r kvm/kernel/include/*
+ln -s %{_kernelsrcdir}/include/linux kvm/kernel/include
+ln -s %{_kernelsrcdir}/arch/%{karch}/include/asm kvm/kernel/include
 %endif
 
+# we build kernel modules with build_kernel_modules macro
+mv -f kvm/kernel/configure kvm/kernel/configure_kvm
+
 # not ac stuff
 ./configure \
-	%{!?with_kernel:--with-patched-kernel} \
 	%{!?with_userspace:--disable-sdl} \
 	%{!?with_userspace:--disable-gfx-check} \
 	--audio-drv-list=oss,alsa \
-	--arch=%{carch} \
-	--disable-gcc-check \
+	--enable-mixemu \
 	--disable-werror \
-	--prefix=%{_prefix} \
+	--prefix=%{_prefix} 
+
+%if %{with kernel}
+cd kvm/kernel
+./configure_kvm \
+	--arch=%{carch} \
 	--kerneldir=%{_kernelsrcdir}
+cd ../..
+%endif
 
-echo "CFLAGS=%{rpmcflags}" >> user/config.mak
+echo "CFLAGS=%{rpmcflags}" >> kvm/user/config.mak
 
 %if %{with userspace}
-%{__make} qemu \
+%{__make} \
 	CC="%{__cc}"
 %endif
 
 %if %{with kernel}
-%build_kernel_modules -C kernel -m kvm,kvm-amd,kvm-intel
+%build_kernel_modules -C kvm/kernel -m kvm,kvm-amd,kvm-intel
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
-%{__make} -C qemu install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{without internal_qemu}
 # removing files which are provided by required qemu package
 rm -rf $RPM_BUILD_ROOT%{_datadir}/qemu $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT%{_docdir}
 rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-img
+rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-nbd
+rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-io
 %endif
 
 # changing binary name to avoid conflict with qemu
 mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-%{qemuarch} $RPM_BUILD_ROOT%{_bindir}/%{pname}
-install kvm_stat $RPM_BUILD_ROOT%{_bindir}
+install kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}
 
-install -D scripts/65-kvm.rules $RPM_BUILD_ROOT/etc/udev/rules.d/kvm.rules
+install -D kvm/scripts/65-kvm.rules $RPM_BUILD_ROOT/etc/udev/rules.d/kvm.rules
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m kernel/{kvm-amd,kvm,kvm-intel} -d misc
+%install_kernel_modules -m kvm/kernel/{kvm-amd,kvm,kvm-intel} -d misc
 %endif
 
 %clean
@@ -218,9 +236,10 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kvm*
-%attr(755,root,root) %{_bindir}/qemu-nbd
 %if %{with internal_qemu}
+%attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_bindir}/qemu-img
+%attr(755,root,root) %{_bindir}/qemu-io
 %{_datadir}/qemu
 %{_docdir}/qemu
 %{_mandir}/man1/qemu.1*
@@ -245,6 +264,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2009/06/20 20:04:02  mguevara
+- up to 86-1; updated kvm-kernel-release.patch; moved qemu-nbd to the
+  internal_qemu bcond to eliminate conflicts between kvm and qemu packages;
+  userland builds and works fine (tested with kernel-2.6.28.9-3.x86_64);
+  added some notes about source structure changes.
+
 Revision 1.81  2009/03/16 22:59:22  glen
 - qemu file-conflict
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kvm/kvm-kernel-release.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kvm/kvm.spec?r1=1.81&r2=1.82&f=u

More information about the pld-cvs-commit mailing list