packages: VirtualBox/VirtualBox.spec - added subpackage kernel-misc-vboxpci...
charles
charles at pld-linux.org
Tue Jul 19 22:28:34 CEST 2011
Author: charles Date: Tue Jul 19 20:28:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added subpackage kernel-misc-vboxpci (with init script)
- added -build.patch
- sorted/renumbered sources & patches
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.378 -> 1.379)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.378 packages/VirtualBox/VirtualBox.spec:1.379
--- packages/VirtualBox/VirtualBox.spec:1.378 Tue Jul 19 22:06:14 2011
+++ packages/VirtualBox/VirtualBox.spec Tue Jul 19 22:28:29 2011
@@ -52,20 +52,22 @@
Source5: %{pname}-vboxnetflt.init
Source6: %{pname}-vboxsf.init
Source7: %{pname}-vboxnetadp.init
-Source8: %{pname}.sh
-Source9: mount.vdi
-Source10: udev.rules
+Source8: %{pname}-vboxpci.init
+Source9: %{pname}.sh
+Source10: mount.vdi
+Source11: udev.rules
Patch0: %{pname}-configure-spaces.patch
Patch1: %{pname}-export_modules.patch
Patch2: %{pname}-VBoxSysInfo.patch
Patch3: %{pname}-warning_workaround.patch
Patch4: %{pname}-vnc.patch
Patch5: %{pname}-dri.patch
+Patch6: %{pname}-disable_build_NetBiosBin.patch
+Patch7: %{pname}-build.patch
# ubuntu patches
-Patch6: 16-no-update.patch
-Patch7: 18-system-xorg.patch
+Patch10: 16-no-update.patch
+Patch11: 18-system-xorg.patch
# /ubuntu patches
-Patch8: %{pname}-disable_build_NetBiosBin.patch
URL: http://www.virtualbox.org/
BuildRequires: rpmbuild(macros) >= 1.535
%if %{with userspace}
@@ -378,6 +380,30 @@
Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik filtrowania sieci
dla systemu głównego.
+%package -n kernel%{_alt_kernel}-misc-vboxpci
+Summary: VirtualBox OSE PCI card passthrough Driver
+Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE
+Release: %{rel}@%{_kernel_ver_str}
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
+Requires: dev >= 2.9.0-7
+Requires: kernel%{_alt_kernel}-misc-vboxdrv
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
+Provides: kernel(vboxpci) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-misc-vboxpci
+VirtualBox OSE PCI card passthrough driver that works as host proxy between
+guest and PCI hardware.
+
+You should install this package in your Host OS.
+
+%description -n kernel%{_alt_kernel}-misc-vboxnetflt -l pl.UTF-8
+Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik, ktory działa jako proxy
+między gościem i gospodarzem sprzętu PCI.
+
%package -n kernel%{_alt_kernel}-misc-vboxsf
Summary: Host file system access (Shared Folders) for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE
@@ -434,11 +460,13 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
-sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh
+sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
cd PLD-MODULE-BUILD
@@ -448,9 +476,9 @@
../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
tar -zxf host-modules.tar.gz -C HostDrivers
cd -
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch10 -p1
+%patch11 -p1
+
%build
%if %{with userspace}
@@ -478,6 +506,7 @@
%build_kernel_modules -m vboxdrv -C vboxdrv
%build_kernel_modules -m vboxnetadp -C vboxnetadp
%build_kernel_modules -m vboxnetflt -C vboxnetflt
+%build_kernel_modules -m vboxpci -C vboxpci
cd ../GuestDrivers
%build_kernel_modules -m vboxguest -C vboxguest
@@ -505,7 +534,7 @@
cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
-install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
+install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/%{pname}
for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
ln -s %{_libdir}/%{pname}/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
@@ -530,7 +559,7 @@
mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
install -d $RPM_BUILD_ROOT/etc/udev/rules.d
-cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+cp -a %{SOURCE11} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
install -d $RPM_BUILD_ROOT/%{_lib}/security
mv $RPM_BUILD_ROOT{%{_libdir}/VirtualBox/additions,/%{_lib}/security}/pam_vbox.so
@@ -575,9 +604,11 @@
install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxsf
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
+install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxpci
%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo_drm/vboxvideo -d misc
@@ -600,6 +631,7 @@
Additionally you might want to install:
kernel-misc-vboxnetadp-%{version}-%{rel}@%{_kernel_ver_str}
kernel-misc-vboxnetflt-%{version}-%{rel}@%{_kernel_ver_str}
+ kernel-misc-vboxpci-%{version}-%{rel}@%{_kernel_ver_str}
On Guest Linux system you might want to install:
kernel-misc-vboxguest-%{version}-%{rel}@%{_kernel_ver_str}
@@ -669,6 +701,20 @@
/sbin/chkconfig --del vboxnetflt
fi
+%post -n kernel%{_alt_kernel}-misc-vboxpci
+%depmod %{_kernel_ver}
+/sbin/chkconfig --add vboxpci
+%service vboxnetflt restart "VirtualBox OSE PCI passthrough driver"
+
+%postun -n kernel%{_alt_kernel}-misc-vboxpci
+%depmod %{_kernel_ver}
+
+%preun -n kernel%{_alt_kernel}-misc-vboxpci
+if [ "$1" = "0" ]; then
+ %service vboxpci stop
+ /sbin/chkconfig --del vboxpci
+fi
+
%post -n kernel%{_alt_kernel}-misc-vboxsf
%depmod %{_kernel_ver}
/sbin/chkconfig --add vboxsf
@@ -710,6 +756,7 @@
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuth.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuthSimple.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxBalloonCtrl
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxCreateUSBNode.sh
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDbg.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD2.so
@@ -872,6 +919,11 @@
%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
+%files -n kernel%{_alt_kernel}-misc-vboxpci
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxpci
+/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*
+
%files -n kernel%{_alt_kernel}-misc-vboxsf
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxsf
@@ -889,6 +941,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.379 2011/07/19 20:28:29 charles
+- added subpackage kernel-misc-vboxpci (with init script)
+- added -build.patch
+- sorted/renumbered sources & patches
+
Revision 1.378 2011/07/19 20:06:14 lisu
- updated to 4.1.0
- obsoleted patches: VirtualBox-vboxnetflt-no-qdisc.patch, 22-no-static-libstdcpp.patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.378&r2=1.379&f=u
More information about the pld-cvs-commit
mailing list