Author: glen Date: Thu Jul 3 12:29:12 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- update for 2.6.22 kernel, old one in LINUX_2_6_16 branch
---- Files affected:
SPECS:
VirtualBox.spec (1.44.2.14 -> 1.44.2.15)
---- Diffs:
================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.44.2.14 SPECS/VirtualBox.spec:1.44.2.15
--- SPECS/VirtualBox.spec:1.44.2.14 Tue Jun 10 19:24:07 2008
+++ SPECS/VirtualBox.spec Thu Jul 3 14:29:07 2008
@@ -10,8 +10,6 @@
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel module
-%bcond_without up # without up packages
-%bcond_without smp # without SMP kernel modules
%bcond_without userspace # don't build userspace package
%define rel 1
@@ -143,6 +141,7 @@
%package udev
Summary: udev rules for VirtualBox OSE kernel modules
Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
+Release: %{rel}
Group: Base/Kernel
Requires: udev
@@ -155,6 +154,7 @@
%package -n kernel%{_alt_kernel}-misc-vboxadd
Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.9.0-7
@@ -169,6 +169,7 @@
%package -n kernel%{_alt_kernel}-misc-vboxdrv
Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.9.0-7
@@ -183,6 +184,7 @@
%package -n kernel%{_alt_kernel}-misc-vboxvfs
Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.9.0-7
@@ -194,51 +196,10 @@
%description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8
Moduł jądra Linuksa vboxvfs dla VirtualBoksa.
-%package -n kernel%{_alt_kernel}-smp-misc-vboxadd
-Summary: Linux SMP kernel module for VirtualBox OSE
-Summary(pl.UTF-8): Moduł jądra Linuksa SMP dla VirtualBoksa
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.9.0-7
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxadd
-Linux SMP kernel module vboxadd for VirtualBox OSE.
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxadd -l pl.UTF-8
-Moduł jądra Linuksa SMP vboxadd dla VirtualBoksa.
-
-%package -n kernel%{_alt_kernel}-smp-misc-vboxdrv
-Summary: Linux SMP kernel module for VirtualBox OSE
-Summary(pl.UTF-8): Moduł jądra Linuksa SMP dla VirtualBoksa
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.9.0-7
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxdrv
-Linux SMP kernel module vboxdrv for VirtualBox OSE.
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxdrv -l pl.UTF-8
-Moduł jądra Linuksa SMP vboxdrv dla VirtualBoksa.
-
-%package -n kernel%{_alt_kernel}-smp-misc-vboxvfs
-Summary: Linux SMP kernel module for VirtualBox OSE
-Summary(pl.UTF-8): Moduł jądra Linuksa SMP dla VirtualBoksa
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.9.0-7
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxvfs
-Linux SMP kernel module vboxvfs for VirtualBox OSE.
-
-%description -n kernel%{_alt_kernel}-smp-misc-vboxvfs -l pl.UTF-8
-Moduł jądra Linuksa SMP vboxvfs dla VirtualBoksa.
-
%package -n X11-driver-input-vboxmouse
Summary: X.org mouse driver for VirtualBox OSE guest OS
Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie
+Release: %{rel}
Group: X11/Applications
Requires: X11-Xserver >= 1:6.9.0
@@ -251,6 +212,7 @@
%package -n X11-driver-video-vboxvideo
Summary: X.org video driver for VirtualBox OSE guest OS
Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie
+Release: %{rel}
Group: X11/Applications
Requires: X11-Xserver >= 1:6.9.0
@@ -303,7 +265,8 @@
cd PLD-MODULE-BUILD
%build_kernel_modules -m vboxadd -C vboxadd
%build_kernel_modules -m vboxdrv -C vboxdrv
-%build_kernel_modules -m vboxvfs -C vboxvfs
+cp -a vboxadd/Module.symvers vboxvfs
+%build_kernel_modules -m vboxvfs -C vboxvfs -c
cd ..
%endif
@@ -404,12 +367,6 @@
%postun -n kernel%{_alt_kernel}-misc-vboxvfs
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-misc-vboxdrv
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-misc-vboxdrv
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -485,7 +442,6 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-misc-vboxadd
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/vboxadd.ko*
@@ -499,27 +455,15 @@
/lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-vboxadd
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/vboxadd.ko*
-
-%files -n kernel%{_alt_kernel}-smp-misc-vboxdrv
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko*
-
-%files -n kernel%{_alt_kernel}-smp-misc-vboxvfs
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/vboxvfs.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44.2.15 2008/07/03 12:29:07 glen
+- update for 2.6.22 kernel, old one in LINUX_2_6_16 branch
+
Revision 1.44.2.14 2008/06/10 17:24:07 marcus
- up to 1.6.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.44.2.14&r2=1.44.2.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
