- Release 0.2

- Req kernel module
- initial init script
- fixed build and install so it started its basic work

Changed files:
    VirtualBox.spec -> 1.13

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 64526302f53c8e192ad0ca2347137407d019fa8d..9c7f457849d20204a0d950e730d14cc4a55bbdaf 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,15 +1,11 @@
 #
 # TODO:
-# - Doesn't compile without /usr/src/linux/include/linux/autoconf.h so one must
-#   symlink it before building package. This is because during compilation kernel
-#   module is being build. Since we are building kernel modules later
-#   sources/makefiles probably needs some hacking to drop this requirement.
 # - Home page says that some addons should be compiled, I don't see any except.
 #   vboxaddon kernel module and {vboxmouse,vboxvideo)_drv.so. Are they required?
-# - BR list was a quickie so it may be incomplete or too big.
-# - R list probably required.
-# - .desktop file, some wrapper to launch VirtualBox (LD_LIBRARY_PATH must include
-#   %{_libdir}/VirtualBox), maybe some init script to launch VBoxSVC.
+# - .desktop file
+# - it seems that VBoxSVC should not be started by init script but I'm still 
+#   testing this
+# - /dev/vboxdrv should belong to vboxusers group and have rw rights to it
 # - Devel stuff is not packaged yet.
 # - Now its EA ix86 x8664, but looking into autogenerated env.sh suggests that
 #   code may be compiled exclusively for i686.
@@ -17,17 +13,21 @@
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
+%bcond_without up              # without up packages
 %bcond_without smp             # without SMP kernel modules
-#
+
+%define                _rel            0.2
+
 Summary:       VirtualBox
 Summary(pl.UTF-8):     VirtualBox
 Name:          VirtualBox
 Version:       1.3.6
-Release:       0.1
+Release:       %{_rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://www.virtualbox.org/download/%{version}/VirtualBox-OSE-%{version}.tar.bz2
 # Source0-md5: 70c24ccee8b5778efd8d22f9996fbec9
+Source1:       virtualbox.init
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-qt-paths.patch
 URL:           http://www.virtualbox.org/
@@ -48,6 +48,7 @@ BuildRequires:        xalan-c-devel >= 1.10.0
 BuildRequires: xerces-c-devel >= 2.6.0
 BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: zlib-devel >= 1.2.1
+Requires:      kernel(vboxdrv) = %{version}-%{_rel}
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -144,9 +145,20 @@ Moduł jądra Linuksa SMP vboxdrv dla VirtualBoksa.
 %patch1 -p0
 
 %build
+KDIR="%{_builddir}/%{buildsubdir}/kernel"
+mkdir -p $KDIR
+cp -a %{_kernelsrcdir}/include $KDIR
+%ifarch %{x8664}
+ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
+%else
+ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+%endif
+ln -sf $KDIR/include/linux/autoconf-up.h $KDIR/include/linux/autoconf.h
+
 ./configure \
        --with-gcc="%{__cc}" \
-       --with-g++="%{__cxx}"
+       --with-g++="%{__cxx}" \
+       --with-linux="$KDIR"
 . ./env.sh
 kmk
 
@@ -179,7 +191,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
                SYSOUT=$PWD/o \
                M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
-       mv vboxdrv.ko vboxdrv-$cfg.ko
+       mv vboxdrv.ko ../../../../../vboxdrv-$cfg.ko
 done
 
 %install
@@ -187,26 +199,61 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d \
        $RPM_BUILD_ROOT%{_bindir} \
-       $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+       $RPM_BUILD_ROOT%{_libdir}/VirtualBox \
+       $RPM_BUILD_ROOT/etc/rc.d/init.d
+
+cat > VBox.sh << EOF
+#!/bin/sh
+
+if [ ! -c /dev/vboxdrv ]; then
+    echo "Special character device /dev/vboxdrv doesn't exists!"
+    echo "Check your installation and if vboxdrv kernel module is loaded."
+    exit 1
+fi
 
-install out/linux.%{_outdir}/release/bin/{VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox} \
-       $RPM_BUILD_ROOT%{_bindir}
-install out/linux.%{_outdir}/release/bin/VBox{DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
+if [ ! -w /dev/vboxdrv ]; then
+    echo "You don't have write access to /dev/vboxdrv!"
+    echo "Correct this situation or contact with your system administrator."
+    exit 1
+fi
+
+BINFILE=\`basename \$0\`
+LD_LIBRARY_PATH=%{_libdir}/VirtualBox %{_libdir}/VirtualBox/\$BINFILE \$@
+EOF
+
+for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox}
+do
+install out/linux.%{_outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
+install VBox.sh $RPM_BUILD_ROOT%{_bindir}/$f
+done
+
+install out/linux.%{_outdir}/release/bin/VBox{C,DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install out/linux.%{_outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
+install out/linux.%{_outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
-%if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+install vboxdrv-up.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko
 %if %{with smp} && %{with dist_kernel}
-install out/linux.%{_outdir}/release/bin/src/vboxdrv-smp.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko
-%endif
+install vboxdrv-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko
 %endif
 
+cp -a out/linux.%{_outdir}/release/bin/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add virtualbox
+%service virtualbox restart "VBoxSVC daemon"
+
+%preun 
+if [ "$1" = "0" ]; then
+       %service virtualbox stop
+       /sbin/chkconfig --del virtualbox
+fi
+
 %post  -n kernel%{_alt_kernel}-misc-vboxdrv
 %depmod %{_kernel_ver}
 
@@ -223,14 +270,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%dir %{_libdir}/VirtualBox
+%dir %{_libdir}/VirtualBox/components
 %attr(755,root,root) %{_bindir}/VBox*
 %attr(755,root,root) %{_bindir}/VirtualBox
-%{_libdir}/VirtualBox
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxManage
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
+%attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
+%{_libdir}/VirtualBox/*.gc
+%{_libdir}/VirtualBox/*.r0
+%{_libdir}/VirtualBox/VBox*.so
+%{_libdir}/VirtualBox/*.xpt
+%{_libdir}/VirtualBox/components/*
+%attr(754,root,root) /etc/rc.d/init.d/virtualbox
 
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-vboxdrv
 %defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko.gz
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-misc-vboxdrv
 %defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko.gz
 %endif