Author: arvenil Date: Sun Jun 1 16:28:28 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- fix building without userspace (merged from HEAD)
- alt_kernel build fixes on builders (merged from HEAD)
---- Files affected:
SPECS:
kvm.spec (1.37.2.5 -> 1.37.2.6)
---- Diffs:
================================================================
Index: SPECS/kvm.spec
diff -u SPECS/kvm.spec:1.37.2.5 SPECS/kvm.spec:1.37.2.6
--- SPECS/kvm.spec:1.37.2.5 Sun Jun 1 17:57:24 2008
+++ SPECS/kvm.spec Sun Jun 1 18:28:23 2008
@@ -9,10 +9,22 @@
%bcond_without kernel # build for unpatched kernel (which
doesn't provide kvm.ko already)
%bcond_without userspace # don't build userspace utilities
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
+%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
+%endif
+
%define rel 1
+%define pname kvm
Summary: Kernel-based Virtual Machine for Linux
Summary(pl.UTF-8): Oparta na jądrze maszyna wirtualna dla Linuksa
-Name: kvm
+Name: %{pname}%{_alt_kernel}
Version: 69
Release: %{rel}
License: GPL v2
@@ -54,13 +66,23 @@
maszyn wirtualnych ma prywatny wirtualizowany sprzęt: kartę sieciową,
dysk, kartę graficzną itp.
+%package udev
+Summary: kvm udev scripts
+Summary(pl.UTF-8): Skrypty udev dla kvm
+Group: Application/System
+
+%description udev
+kvm udev scripts.
+
+%description udev -l pl.UTF-8
+Skrypty udev dla kvm.
+
%package -n kernel%{_alt_kernel}-misc-kvm
Summary: kvm - Linux kernel module
Summary(pl.UTF-8): kvm - moduł jądra Linuksa
Release: [EMAIL PROTECTED]
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel}
-License: GPL v2
Requires(post,postun): /sbin/depmod
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
@@ -74,7 +96,7 @@
kvm - moduł jądra Linuksa.
%prep
-%setup -q
+%setup -q -n %{pname}-%{version}
%build
# not ac stuff
@@ -84,7 +106,12 @@
--kerneldir=%{_kernelsrcdir} \
--prefix=%{_prefix} \
--kerneldir=$PWD/kernel \
+%if %{with userspace}
--enable-alsa \
+%else
+ --disable-gfx-check \
+ --disable-sdl \
+%endif
--qemu-cc="%{__cc}"
%if %{with userspace}
@@ -107,12 +134,13 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-img
# changing binary name to avoid conflict with qemu
-mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64
$RPM_BUILD_ROOT%{_bindir}/%{name}
+mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64
$RPM_BUILD_ROOT%{_bindir}/%{pname}
install kvm_stat $RPM_BUILD_ROOT%{_bindir}
+
+install -D scripts/65-kvm.rules $RPM_BUILD_ROOT/etc/udev/rules.d/kvm.rules
%endif
%if %{with kernel}
-install -D scripts/65-kvm.rules $RPM_BUILD_ROOT/etc/udev/rules.d/kvm.rules
%install_kernel_modules -m kernel/{kvm-amd,kvm,kvm-intel} -d misc
%endif
@@ -134,13 +162,16 @@
%if %{with userspace}
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}*
+%attr(755,root,root) %{_bindir}/kvm*
+
+%files udev
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/kvm.rules
%endif
%if %{with kernel}
%files -n kernel%{_alt_kernel}-misc-kvm
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/kvm.rules
/lib/modules/%{_kernel_ver}/misc/kvm*
%endif
@@ -150,6 +181,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37.2.6 2008-06-01 16:28:23 arvenil
+- fix building without userspace (merged from HEAD)
+- alt_kernel build fixes on builders (merged from HEAD)
+
Revision 1.37.2.5 2008-06-01 15:57:24 arvenil
- up to 69
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kvm.spec?r1=1.37.2.5&r2=1.37.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
