SPECS: kvm.spec - kvm-27, NFY

Fri Jun 8 00:02:43 CEST 2007

Author: areq                         Date: Thu Jun  7 22:02:43 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kvm-27, NFY

---- Files affected:
SPECS:
   kvm.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/kvm.spec
diff -u SPECS/kvm.spec:1.7 SPECS/kvm.spec:1.8

--- SPECS/kvm.spec:1.7	Mon Feb 12 23:09:10 2007
+++ SPECS/kvm.spec	Fri Jun  8 00:02:38 2007
@@ -1,9 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without  dist_kernel             # without distribution kernel
-%bcond_with     kernel                  # build for unpatched kernel (which doesn't provide kvm.ko already)
-%bcond_without  smp                     # don't build SMP module
+%bcond_without  dist_kernel     	# allow non-distribution kernel
+%bcond_without  kernel                  # build for unpatched kernel (which doesn't provide kvm.ko already)
 %bcond_without  userspace               # don't build userspace utilities
 
 %define	no_install_post_strip	1
@@ -13,18 +12,17 @@
 Summary:	Kernel-based Virtual Machine for Linux
 Summary(pl.UTF-8):	Oparta na jądrze maszyna wirtualna dla Linuksa
 Name:		kvm
-Version:	12
+Version:	27
 Release:	%{_rel}
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/kvm/%{name}-%{version}.tar.gz
-# Source0-md5:	c336921942daa096063bbb471ed6eecd
-Patch0:         %{name}-headers.patch
+# Source0-md5:	1ba05fc3eec2afced62f06c242bb8ddc
 URL:		http://kvm.sourceforge.net/
 BuildRequires:	bash
-%if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
-BuildRequires:	rpmbuild(macros) >= 1.330
+%if %{with kernel}
+BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 %if %{with userspace}
 BuildRequires:	SDL-devel
@@ -59,7 +57,7 @@
 Summary(pl.UTF-8):	kvm - moduł jądra Linuksa
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 License:	Free to use, non-distributable
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
@@ -70,68 +68,24 @@
 %description -n kernel%{_alt_kernel}-misc-kvm -l pl.UTF-8
 kvm - moduł jądra Linuka.
 
-%package -n kernel%{_alt_kernel}-smp-misc-kvm
-Summary:	kvm - Linux SMP kernel module
-Summary(pl.UTF-8):	kvm - moduł jądra Linuksa SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-License:	Free to use, non-distributable
-Requires(post,postun):	/sbin/depmod
-Requires:	module-init-tools >= 3.2.2-2
-
-%description -n kernel%{_alt_kernel}-smp-misc-kvm
-kvm - Linux SMP kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-misc-kvm -l pl.UTF-8
-kvm - moduł jądra Linuksa SMP.
-
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # not ac stuff
 ./configure \
 	%{!?with_kernel:--with-patched-kernel} \
 	--prefix=%{_libdir}/kvm \
+	--kerneldir=$PWD/kernel \
 	--qemu-cc="%{__cc}"
 
 %if %{with userspace}
-# FIXME: no references to %{_kernelsrcdir} outside kernel allowed
-%{__make} -C user KERNELDIR=%{_kernelsrcdir}
-%{__make} -C qemu KERNELDIR=%{_kernelsrcdir}
+%{__make} -C user
+%{__make} -C qemu
 %endif
 
 %if %{with kernel}
-cd kernel
-mv include include-kvm
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-		if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-				exit 1
-		fi
-		rm -rf include
-		install -d include/{linux,config}
-	cp include-kvm/linux/*.h include/linux/
-		ln -sf %{_kernelsrcdir}/config-$cfg .config
-		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	%if %{without dist_kernel}
-	[ ! -x %{_kernelsrcdir}/scripts/kallsyms ] || ln -sf %{_kernelsrcdir}/scripts
-	%endif
-		touch include/config/MARKER
-		%{__make} -C %{_kernelsrcdir} clean \
-				RCS_FIND_IGNORE="-name '*.ko' -o" \
-				M=$PWD O=$PWD \
-				%{?with_verbose:V=1}
-		%{__make} -C %{_kernelsrcdir} modules \
-				M=$PWD O=$PWD \
-				%{?with_verbose:V=1}
-		mv kvm{,-$cfg}.ko
-done
-cd ..
+%build_kernel_modules -C kernel -m kvm,kvm-amd,kvm-intel
 %endif
 
 %install
@@ -145,7 +99,7 @@
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m kernel/kvm -d misc
+%install_kernel_modules -m kernel/{kvm-amd,kvm,kvm-intel} -d misc
 %endif
 
 %clean
@@ -157,12 +111,6 @@
 %postun -n kernel%{_alt_kernel}-misc-kvm
 %depmod %{_kernel_ver}
 
-%post   -n kernel%{_alt_kernel}-smp-misc-kvm
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-misc-kvm
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -179,13 +127,7 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-kvm
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/kvm.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-kvm
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/kvm.ko*
-%endif
+/lib/modules/%{_kernel_ver}/misc/kvm*
 %endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -194,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/06/07 22:02:38  areq
+- kvm-27, NFY
+
 Revision 1.7  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kvm.spec?r1=1.7&r2=1.8&f=u

