# TODO
# - java bindings
# - Package SDK.
-# - Package utils (and write initscripts ?) for Guest OS.
# - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
# If so check if it is distributable.
-# - resolve mess with subpackages?
-# - addtions: iso (containing additions/*.iso)
-# - guest: to be installed to guests (deps on x11 drivers)
+# - guest x11 additions: currently incomplete/untested
# - enable VDE networking: --enable-vde
+# - initscripts for webservice
#
# Conditional build:
%bcond_without doc # don't build the documentation
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel module
%bcond_without userspace # don't build userspace package
-%bcond_with webservice # webservice (soap) support
+%bcond_with webservice # webservice (SOAP) support
+%bcond_without lightdm # lightdm greeter
%bcond_without verbose
-%bcond_with force_userspace # force userspace build (useful if alt_kernel is set)
%if %{without kernel}
%undefine with_dist_kernel
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%if %{with force_userspace}
-%define with_userspace 1
-%endif
%if %{without userspace}
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
%endif
-%define rel 1
+%define rel 0.1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 4.2.10
+Version: 4.3.0
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 99349df34caacdecbb7cf3908631c3f3
+# Source0-md5: 1f49237686d095859f3dbea0941f8b12
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: e49046cd56398f9f9b8410154f1a0393
-Source3: %{pname}-vboxdrv.init
-Source4: %{pname}-vboxguest.init
-Source5: %{pname}-vboxnetflt.init
-Source6: %{pname}-vboxsf.init
-Source7: %{pname}-vboxnetadp.init
-Source8: %{pname}-vboxpci.init
-Source9: %{pname}.sh
-Source10: mount.vdi
-Source11: udev.rules
-Source12: %{pname}-vboxdrv-modules-load.conf
-Source13: %{pname}-vboxguest-modules-load.conf
-Source14: %{pname}-vboxnetflt-modules-load.conf
-Source15: %{pname}-vboxsf-modules-load.conf
-Source16: %{pname}-vboxnetadp-modules-load.conf
-Source17: %{pname}-vboxpci-modules-load.conf
+# Source1-md5: 6b72a59aba1660afa4f430faa88d727a
+Source2: vboxservice.init
+Source3: vboxservice.service
+Source4: %{pname}.sh
+Source5: mount.vdi
+Source6: udev.rules
+Source7: %{pname}-virtualbox-host-modules-load.conf
+Source8: %{pname}-virtualbox-guest-modules-load.conf
Patch0: %{pname}-configure-spaces.patch
Patch1: %{pname}-VBoxSysInfo.patch
Patch2: %{pname}-warning_workaround.patch
Patch3: %{pname}-dri.patch
-Patch4: %{pname}-disable_build_NetBiosBin.patch
Patch5: xserver-1.12.patch
+Patch7: lightdm-greeter-glib-includes.patch
+Patch8: lightdm-greeter-g++-link.patch
# ubuntu patches
Patch10: 16-no-update.patch
Patch11: 18-system-xorg.patch
%{?with_doc:BuildRequires: docbook-dtd44-xml}
BuildRequires: gcc >= 5:3.2.3
%{?with_webservice:BuildRequires: gsoap-devel}
-BuildRequires: kBuild >= 0.1.9998-2
+BuildRequires: issue
+BuildRequires: kBuild >= 0.1.9998.2700
BuildRequires: libIDL-devel
BuildRequires: libcap-static
BuildRequires: libdrm-devel
BuildRequires: libxml2-devel >= 2.6.26
BuildRequires: libxslt-devel >= 1.1.17
BuildRequires: libxslt-progs >= 1.1.17
+%{?with_lightdm:BuildRequires: lightdm-libs-qt-devel}
BuildRequires: makeself
BuildRequires: mkisofs
BuildRequires: pam-devel
BuildRequires: python-modules
BuildRequires: qt4-build >= 4.2.0
BuildRequires: qt4-linguist
-BuildRequires: rpmbuild(macros) >= 1.627
+BuildRequires: rpmbuild(macros) >= 1.664
BuildRequires: sed >= 4.0
%if %{with doc}
BuildRequires: texlive-fonts-bitstream
Requires(pre): /usr/sbin/groupadd
Requires: QtCore >= 4.7.0
Requires: desktop-file-utils
+Requires: fontconfig
+Requires: fonts-Type1-urw
Requires: libvncserver >= 0.9.9
+Requires: udev-core
Suggests: gxmessage
Provides: group(vbox)
+Obsoletes: VirtualBox-udev < 4.2.10-5
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%endif
%define vbox_platform linux.%{vbox_arch}
%define outdir out/%{vbox_platform}/release/bin
-%define _sbindir /sbin
-
-# workaround buggy 'file' results:
-#
-# EfiThunk: \0
-# qt_ro.qm: \0 "<\270d\030\312\357\234\225\315!\034\277`\241\275\335B"
-# VBoxEFI32.fd: \0
-# VBoxEFI64.fd: \0
-#
-# which lead to 'Stripping ... ELF shared libraries... (...)/nls/qt_ro.qm: File format not recognized'
-%define _noautostrip .*%{_libdir}/%{name}/.*
+%define objdir out/%{vbox_platform}/release/obj
%description
Oracle VirtualBox is a general-purpose full virtualizer for x86
%description doc
This package contains VirtualBox User Manual.
-%package udev
-Summary: udev rules for VirtualBox kernel modules
-Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
-Group: Base/Kernel
-Requires: udev-core
-
-%description udev
-udev rules for VirtualBox kernel modules.
-
-You should install this package in your Host OS and in Guest OS.
-
-%description udev -l pl.UTF-8
-Reguły udev dla modułów jądra Linuksa dla VirtualBoksa.
-
%package additions
Summary: VirtualBox Guest Additions
Group: Base
You should install this package in your Host OS.
%package guest
-Summary: VirtualBox Guest Additions
+Summary: VirtualBox Guest tools
Group: Base
-Requires: xorg-driver-input-vboxmouse = %{version}-%{release}
-Requires: xorg-driver-video-vboxvideo = %{version}-%{release}
-Suggests: kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str}
-Suggests: kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str}
+Requires(post,preun): /sbin/chkconfig
+Requires(post): systemd-units >= 38
+Requires: systemd-units >= 38
+Requires: rc-scripts
+Suggests: kernel(vboxguest)
+Suggests: kernel(vboxsf)
+Suggests: pam-pam_vbox
%description guest
Tools that utilize kernel modules for supporting integration with the
-Host, including file sharing and tracking of mouse pointer movement
-and X.org X11 video and mouse driver.
+Host, including file sharing.
+
+You should install this package in your Guest OS for base VirtualBox
+communication
+
+%package guest-x11
+Summary: VirtualBox Guest Additions
+Group: Base
+Requires: %{name}-guest = %{version}-%{release}
+Requires: xorg-driver-video-vboxvideo = %{version}-%{release}
+Suggests: kernel(vboxvideo)
+Obsoletes: xorg-driver-input-vboxmouse < %{version}-%{release}
+
+%description guest-x11
+Tools for X11 session that utilize kernel modules for supporting
+integration with the Host, like tracking of mouse pointer movement and
+X.org X11 video and mouse drivers
+
+You should install this package in your Guest OS for X11 session.
+
+%package webservice
+Summary: VirtualBox Web Service
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+
+%description webservice
+This package contains VirtualBox web service API daemon. It allows to
+control virtual machines via web interface.
+
+%package -n lightdm-greeter-vbox
+Summary: VirtualBox greeter for lightdm
+Group: Themes
+# NOTE: '#' in url is lost because rpm treats it as comment, even hacking with
+# macros doesn't help as rpmbuild takes final result to parse
+URL: http://www.virtualbox.org/manual/ch09.html#autologon_unix_lightdm
+Requires: kernel(vboxguest)
+Requires: lightdm >= 1.0.1
+Provides: lightdm-greeter
-You should install this package in your Guest OS.
+%description -n lightdm-greeter-vbox
+VirtualBox greeter for LightDM.
%package -n pam-pam_vbox
Summary: PAM module to perform automated guest logons
PAM module (Pluggable Authentication Module) which can be used to
perform automated guest logons.
-%package -n xorg-driver-input-vboxmouse
-Summary: X.org mouse driver for VirtualBox guest OS
-Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie
-Group: X11/Applications
-Requires: xorg-xserver-server >= 1.0.99.901
-Requires: xorg-xserver-server(xinput-abi) <= 18.0
-Requires: xorg-xserver-server(xinput-abi) >= 4.0
-
-%description -n xorg-driver-input-vboxmouse
-X.org mouse driver for VirtualBox guest OS.
-
-%description -n xorg-driver-input-vboxmouse -l pl.UTF-8
-Sterownik myszy dla systemu gościa w VirtualBoksie.
-
%package -n xorg-driver-video-vboxvideo
Summary: X.org video driver for VirtualBox guest OS
Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie
Requires: Mesa-dri-driver-swrast
Requires: xorg-xserver-libdri >= 1.7.4
Requires: xorg-xserver-server >= 1.0.99.901
-Requires: xorg-xserver-server(videodrv-abi) <= 13.1
+Requires: xorg-xserver-server(videodrv-abi) <= 14.1
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
%description -n xorg-driver-video-vboxvideo
%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
Sterownik grafiki dla systemu gościa w VirtualBoksie.
-%package kernel-init-host
-Summary: SysV initscripts for host kernel modules
-Group: Base/Kernel
-
-%description kernel-init-host
-SysV initscripts for host kernel modules.
-
-%package kernel-init-guest
-Summary: SysV initscripts for guest kernel modules
-Group: Base/Kernel
-
-%description kernel-init-guest
-SysV initscripts for guest kernel modules.
-
# KERNEL PACKAGES
# KEEP ALL REGULAR SUBPACKAGES BEFORE KERNEL PACKAGES.
-%package -n kernel%{_alt_kernel}-misc-vboxguest
-Summary: VirtualBox Guest Additions for Linux Module
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
+%package -n kernel%{_alt_kernel}-virtualbox-guest
+Summary: VirtualBox kernel modules for Linux Guest
+Summary(pl.UTF-8): Moduły VirtualBoksa do jądra Linuksa dla systemu gościa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires(post): systemd-units >= 38
Requires: dev >= 2.9.0-7
+Requires: systemd-units >= 38
%if %{with dist_kernel}
%requires_releq_kernel
+%requires_releq_kernel -n drm
Requires(postun): %releq_kernel
%endif
-Requires: systemd-units >= 38
Suggests: %{name}-kernel-init-guest >= %{version}-%{rel}
Provides: kernel(vboxguest) = %{version}-%{rel}
-Obsoletes: kernel%{_alt_kernel}-misc-vboxadd
-Conflicts: kernel%{_alt_kernel}-misc-vboxdrv
-
-%description -n kernel%{_alt_kernel}-misc-vboxguest
-VirtualBox Guest Additions for Linux Module.
-
-You should install this package in your Guest OS.
-
-%description -n kernel%{_alt_kernel}-misc-vboxguest -l pl.UTF-8
-Moduł jądra Linuksa vboxguest dla VirtualBoksa - dodatki dla systemu
-gościa.
-
-%package -n kernel%{_alt_kernel}-misc-vboxdrv
-Summary: VirtualBox Support Driver
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
+Provides: kernel(vboxsf) = %{version}-%{rel}
+Provides: kernel(vboxvideo) = %{version}-%{rel}
+Obsoletes: kernel-init-guest
+Conflicts: kernel%{_alt_kernel}-virtualbox-host
+
+%description -n kernel%{_alt_kernel}-virtualbox-guest
+This package contains VirtualBox Guest Additions for Linux Module,
+host file system access (Shared Folders) and DRM support for
+Linux guest system.
+
+%description -n kernel%{_alt_kernel}-virtualbox-guest -l pl.UTF-8
+Ten pakiet zawiera moduł jądra Linuksa vboxguest dla VirtualBoksa -
+dodatki dla systemu gościa, dostęp do plików systemu głównego z
+poziomu systemu gościa i sterownik obsługi DRM.
+
+%package -n kernel%{_alt_kernel}-virtualbox-host
+Summary: VirtualBox Support Drivers
+Summary(pl.UTF-8): Moduły jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: systemd-units >= 38
Suggests: %{name}-kernel-init-host >= %{version}-%{rel}
Provides: kernel(vboxdrv) = %{version}-%{rel}
-
-%description -n kernel%{_alt_kernel}-misc-vboxdrv
-VirtualBox Support Driver.
-
-You should install this package in your Host OS.
-
-%description -n kernel%{_alt_kernel}-misc-vboxdrv -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - sterownik wsparcia dla systemu
-głównego.
-
-%package -n kernel%{_alt_kernel}-misc-vboxnetadp
-Summary: VirtualBox Network Adapter Driver
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires(post): systemd-units >= 38
-Requires: dev >= 2.9.0-7
-Requires: kernel%{_alt_kernel}-misc-vboxdrv
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
-%endif
-Requires: systemd-units >= 38
-Suggests: %{name}-kernel-init-host >= %{version}-%{rel}
+Provides: kernel(vboxnetadp) = %{version}-%{rel}
Provides: kernel(vboxnetflt) = %{version}-%{rel}
-
-%description -n kernel%{_alt_kernel}-misc-vboxnetadp
-VirtualBox Network Adapter Driver.
-
-You should install this package in your Host OS.
-
-%description -n kernel%{_alt_kernel}-misc-vboxnetadp -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - sterownik witrualnej karty
-sieciowej.
-
-%package -n kernel%{_alt_kernel}-misc-vboxnetflt
-Summary: VirtualBox Network Filter Driver
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires(post): systemd-units >= 38
-Requires: dev >= 2.9.0-7
-Requires: kernel%{_alt_kernel}-misc-vboxdrv
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
-%endif
-Requires: systemd-units >= 38
-Suggests: %{name}-kernel-init-host >= %{version}-%{rel}
-Provides: kernel(vboxnetflt) = %{version}-%{rel}
-
-%description -n kernel%{_alt_kernel}-misc-vboxnetflt
-VirtualBox Network Filter Driver.
-
-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 - sterownik filtrowania sieci dla
-systemu głównego.
-
-%package -n kernel%{_alt_kernel}-misc-vboxpci
-Summary: VirtualBox PCI card passthrough Driver
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires(post): systemd-units >= 38
-Requires: dev >= 2.9.0-7
-Requires: kernel%{_alt_kernel}-misc-vboxdrv
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
-%endif
-Requires: systemd-units >= 38
-Suggests: %{name}-kernel-init-host >= %{version}-%{rel}
Provides: kernel(vboxpci) = %{version}-%{rel}
+Obsoletes: kernel-init-host
-%description -n kernel%{_alt_kernel}-misc-vboxpci
-VirtualBox 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}-virtualbox-host
+This package contains VirtualBox Support Driver, Network Adapter
+Driver, Network Filter Driver and PCI card passthrough driver that
+works as host proxy between guest and PCI hardware.
-%description -n kernel%{_alt_kernel}-misc-vboxnetflt -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - 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
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires(post): systemd-units >= 38
-Requires: dev >= 2.9.0-7
-Requires: kernel%{_alt_kernel}-misc-vboxguest
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
-%endif
-Requires: systemd-units >= 38
-Suggests: %{name}-kernel-init-guest >= %{version}-%{rel}
-Provides: kernel(vboxsf) = %{version}-%{rel}
-Obsoletes: kernel%{_alt_kernel}-misc-vboxvfs
-
-%description -n kernel%{_alt_kernel}-misc-vboxsf
-Host file system access (Shared Folders) for VirtualBox.
-
-You should install this package in your Guest OS.
-
-%description -n kernel%{_alt_kernel}-misc-vboxsf -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - dostęp do plików systemu
-głównego z poziomu systemu gościa.
-
-%package -n kernel%{_alt_kernel}-misc-vboxvideo
-Summary: DRM support for VirtualBox
-Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.9.0-7
-%if %{with dist_kernel}
-%requires_releq_kernel
-%requires_releq_kernel -n drm
-Requires(postun): %releq_kernel
-%endif
-Provides: kernel(vboxvideo) = %{version}-%{rel}
-
-%description -n kernel%{_alt_kernel}-misc-vboxvideo
-DRM support for VirtualBox.
-
-You should install this package in your Guest OS.
-
-%description -n kernel%{_alt_kernel}-misc-vboxvideo -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
+%description -n kernel%{_alt_kernel}-virtualbox-host -l pl.UTF-8
+Ten pakiet zawiera sterownik wsparcia dla systemu głównego, sterownik
+witrualnej karty sieciowej, sterownik filtrowania sieci dla systemu
+głównego oraz sterownik, ktory działa jako proxy między gościem i
+gospodarzem sprzętu PCI.
%prep
%setup -q -n %{pname}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
+%patch7 -p1
+%patch8 -p1
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
%{__sed} -i -e "s@_LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk
-%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
+%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE4} > VirtualBox-wrapper.sh
install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
cd PLD-MODULE-BUILD
# using system kBuild package
%{__rm} -r kBuild
+cat <<'EOF'>> LocalConfig.kmk
+%{?with_verbose:KBUILD_VERBOSE=3}
+USERNAME=%(id -un)
+__VBOX_BUILD_PUBLISHER=_PLD
+VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
+XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
+VBOX_USE_SYSTEM_XORG_HEADERS=1
+%if %{with lightdm}
+VBOX_WITH_LIGHTDM_GREETER=1
+VBOX_WITH_LIGHTDM_GREETER_PACKING=1
+%endif
+TOOL_GCC3_CFLAGS=%{rpmcflags}
+TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
+VBOX_GCC_OPT=%{rpmcxxflags}
+VBOX_WITH_TESTCASES=
+EOF
+
%build
%if %{with userspace}
-echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk
./configure \
--with-gcc="%{__cc}" \
--with-g++="%{__cxx}" \
%{nil}
XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR)
-kmk %{?_smp_mflags} \
- %{?with_verbose:KBUILD_VERBOSE=3} \
- USER=%(id -un) \
- VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
- XSERVER_VERSION="$XSERVER_VERSION" \
- VBOX_USE_SYSTEM_XORG_HEADERS=1 \
- TOOL_GCC3_CFLAGS="%{rpmcflags}" \
- TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
- VBOX_GCC_OPT="%{rpmcxxflags}" \
- %{nil}
+kmk %{?_smp_mflags}
%endif
%if %{with kernel}
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{pname}/ExtensionPacks} \
+install -d $RPM_BUILD_ROOT{%{_bindir},/sbin,%{_sbindir},%{_libdir}/%{pname}/ExtensionPacks} \
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input}
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input} \
+ $RPM_BUILD_ROOT{/lib/udev,/etc/udev/rules.d} \
+ $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir}}
# test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
if cp -al VBox.png $RPM_BUILD_ROOT/Vbox.png 2>/dev/null; then
install -d $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions
cp -a$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
-install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
+install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/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
done
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
+
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-# xorg other driver versions
-%{__rm} -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so}
-%{__rm} -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxvideo_drv*.{o,so}
# XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
-install -d $RPM_BUILD_ROOT/etc/udev/rules.d
-cp -a %{SOURCE11} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
install -d $RPM_BUILD_ROOT/%{_lib}/security
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop
+%if %{with lightdm}
+install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_sbindir}}/vbox-greeter
+cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
+%endif
+
# unknown - checkme
%if 1
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
%endif
%if %{with kernel}
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modules-load.d},%{_sbindir},%{systemdunitdir}}
-install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
-install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest
-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 -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
%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/GuestDrivers/vboxsf/vboxsf -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc
-install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
+install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
# Tell systemd to load modules
-cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/modules-load.d/vboxdrv.conf
-cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/modules-load.d/vboxguest.conf
-cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetflt.conf
-cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/modules-load.d/vboxsf.conf
-cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetadp.conf
-cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/modules-load.d/vboxpci.conf
-
-# And mask module-loading services
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxdrv.service
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxguest.service
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetflt.service
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxsf.service
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetadp.service
-ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxpci.service
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-host.conf
+cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-guest.conf
%endif
%clean
%post
%update_desktop_database
+for i in /sys/bus/usb/devices/*; do
+ if [ -r "$i/dev" ]; then
+ dev="`cat "$i/dev" 2>/dev/null || true`"
+ major="`expr "$dev" : '\(.*\):' 2> /dev/null || true`"
+ minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null || true`"
+ class="`cat $i/bDeviceClass 2> /dev/null || true`"
+ /lib/udev/VBoxCreateUSBNode.sh "$major" "$minor" "$class" vbox 2>/dev/null
+ fi
+done
cat << 'EOF'
-You must install vboxdrv kernel module for this software to work:
- kernel-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str}
-
-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}
+You must install vboxdrv kernel modules for this software to work:
+ kernel%{_alt_kernel}-virtualbox-host-%{version}-%{rel}@%{_kernel_ver_str}
On Guest Linux system you might want to install:
- kernel-misc-vboxguest-%{version}-%{rel}@%{_kernel_ver_str}
- kernel-misc-vboxsf-%{version}-%{rel}@%{_kernel_ver_str}
- kernel-misc-vboxvideo-%{version}-%{rel}@%{_kernel_ver_str}
+ kernel%{_alt_kernel}-virtualbox-guest-%{version}-%{rel}@%{_kernel_ver_str}
EOF
%groupremove vbox
fi
-%post -n kernel%{_alt_kernel}-misc-vboxguest
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxguest
-%service vboxguest restart "VirtualBox Guest additions driver"
-%systemd_reload
-
-%postun -n kernel%{_alt_kernel}-misc-vboxguest
-%depmod %{_kernel_ver}
-
-%preun -n kernel%{_alt_kernel}-misc-vboxguest
-if [ "$1" = "0" ]; then
- %service vboxguest stop
- /sbin/chkconfig --del vboxguest
-fi
-
-%post -n kernel%{_alt_kernel}-misc-vboxdrv
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxdrv
-%service vboxdrv restart "VirtualBox Support Driver"
-%systemd_reload
-
-%postun -n kernel%{_alt_kernel}-misc-vboxdrv
-%depmod %{_kernel_ver}
-
-%preun -n kernel%{_alt_kernel}-misc-vboxdrv
-if [ "$1" = "0" ]; then
- %service vboxdrv stop
- /sbin/chkconfig --del vboxdrv
-fi
-
-%post -n kernel%{_alt_kernel}-misc-vboxnetadp
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxnetadp
-%service vboxnetadp restart "VirtualBox Network HostOnly driver"
-%systemd_reload
-
-%postun -n kernel%{_alt_kernel}-misc-vboxnetadp
-%depmod %{_kernel_ver}
-
-%preun -n kernel%{_alt_kernel}-misc-vboxnetadp
-if [ "$1" = "0" ]; then
- %service vboxnetadp stop
- /sbin/chkconfig --del vboxnetadp
-fi
-
-%post -n kernel%{_alt_kernel}-misc-vboxnetflt
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxnetflt
-%service vboxnetflt restart "VirtualBox Network Filter driver"
-%systemd_reload
-
-%postun -n kernel%{_alt_kernel}-misc-vboxnetflt
-%depmod %{_kernel_ver}
+%post guest
+/sbin/chkconfig --add vboxservice
+%service vboxservice restart
+%systemd_post vboxservice.service
-%preun -n kernel%{_alt_kernel}-misc-vboxnetflt
+%preun guest
if [ "$1" = "0" ]; then
- %service vboxnetflt stop
- /sbin/chkconfig --del vboxnetflt
+ /sbin/chkconfig --del vboxservice
+ %service vboxservice -q stop
fi
+%systemd_preun vboxservice.service
-%post -n kernel%{_alt_kernel}-misc-vboxpci
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxpci
-%service vboxnetflt restart "VirtualBox PCI passthrough driver"
+%postun guest
%systemd_reload
-%postun -n kernel%{_alt_kernel}-misc-vboxpci
-%depmod %{_kernel_ver}
+%triggerpostun guest -- VirtualBox-guest < 4.3.0-1
+%systemd_trigger vboxservice.service
-%preun -n kernel%{_alt_kernel}-misc-vboxpci
-if [ "$1" = "0" ]; then
- %service vboxpci stop
- /sbin/chkconfig --del vboxpci
-fi
+%pre -n lightdm-greeter-vbox
+%addusertogroup xdm vbox
-%post -n kernel%{_alt_kernel}-misc-vboxsf
+%post -n kernel%{_alt_kernel}-virtualbox-guest
%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxsf
-%service vboxsf restart "VirtualBox Host file system access (Shared Folders)"
-%systemd_reload
-%postun -n kernel%{_alt_kernel}-misc-vboxsf
+%postun -n kernel%{_alt_kernel}-virtualbox-guest
%depmod %{_kernel_ver}
-%preun -n kernel%{_alt_kernel}-misc-vboxsf
-if [ "$1" = "0" ]; then
- %service vboxsf stop
- /sbin/chkconfig --del vboxsf
-fi
-
-%post -n kernel%{_alt_kernel}-misc-vboxvideo
+%post -n kernel%{_alt_kernel}-virtualbox-host
%depmod %{_kernel_ver}
-%postun -n kernel%{_alt_kernel}-misc-vboxvideo
+%postun -n kernel%{_alt_kernel}-virtualbox-host
%depmod %{_kernel_ver}
%if %{with userspace}
%attr(755,root,root) %{_bindir}/VBoxTunctl
%attr(755,root,root) %{_bindir}/VBoxXPCOMIPCD
%attr(755,root,root) %{_bindir}/VirtualBox
-%attr(755,root,root) %{_sbindir}/mount.vdi
+%attr(755,root,root) /sbin/mount.vdi
%attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxBFE
%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxCreateUSBNode.sh
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
+%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
%if %{with doc}
%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
%endif
%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox-wrapper.sh
%attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*/VBoxVNC*.so
+%{_libdir}/%{pname}/VBoxDD2GC.debug
%{_libdir}/%{pname}/VBoxDD2GC.gc
-%{_libdir}/%{pname}/VBoxDDGC.gc
-%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VBoxDD2R0.debug
%{_libdir}/%{pname}/VBoxDD2R0.r0
+%{_libdir}/%{pname}/VBoxDDGC.debug
+%{_libdir}/%{pname}/VBoxDDGC.gc
+%{_libdir}/%{pname}/VBoxDDR0.debug
%{_libdir}/%{pname}/VBoxDDR0.r0
-%{_libdir}/%{pname}/VMMR0.r0
-#%{_libdir}/%{pname}/EfiThunk
%{_libdir}/%{pname}/VBoxEFI32.fd
%{_libdir}/%{pname}/VBoxEFI64.fd
+%{_libdir}/%{pname}/VMMGC.debug
+%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VMMR0.debug
+%{_libdir}/%{pname}/VMMR0.r0
%{_libdir}/%{pname}/components/VBoxXPCOMBase.xpt
%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
%{_libdir}/%{pname}/components/VirtualBox_XPCOM.xpt
%{_libdir}/%{pname}/icons
%{_libdir}/%{pname}/virtualbox.xml
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
+%attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
+
%files additions
%defattr(644,root,root,755)
%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
%files guest
%defattr(644,root,root,755)
+%attr(755,root,root) /sbin/mount.vboxsf
+%attr(754,root,root) /etc/rc.d/init.d/vboxservice
+%{systemdunitdir}/vboxservice.service
+%attr(755,root,root) %{_bindir}/VBoxControl
+%attr(755,root,root) %{_bindir}/VBoxService
+
+%files guest-x11
+%defattr(644,root,root,755)
# NOTE: unfinished, should contain .desktop files for starting up mouse
# integration and other desktop services
# NOTE: the filelist is incomplete too
%attr(755,root,root) %{_bindir}/VBoxClient
-%attr(755,root,root) %{_bindir}/VBoxControl
-%attr(755,root,root) %{_bindir}/VBoxService
/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
/etc/xdg/autostart/vboxclient.desktop
%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd
%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service
%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11
-# XXX these files belong to xorg-driver-video-vboxvideo
-# but probably 18-system-xorg.patch patch is broken?
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_111.so
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_112.so
+
+%if %{with webservice}
+%files webservice
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/webtest
+%endif
+
+%if %{with lightdm}
+%files -n lightdm-greeter-vbox
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/vbox-greeter
+%{_datadir}/xgreeters/vbox-greeter.desktop
+%endif
%files -n pam-pam_vbox
%defattr(644,root,root,755)
%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
%endif
-%files udev
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
-
-%files -n xorg-driver-input-vboxmouse
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/input/vboxmouse_drv.so
-
%files -n xorg-driver-video-vboxvideo
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%endif
%if %{with kernel}
-%files kernel-init-host
+%files -n kernel%{_alt_kernel}-virtualbox-guest
%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/vboxdrv
-%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp
-%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
-%attr(754,root,root) /etc/rc.d/init.d/vboxpci
-%{systemdunitdir}/vboxdrv.service
-%{systemdunitdir}/vboxnetadp.service
-%{systemdunitdir}/vboxnetflt.service
-%{systemdunitdir}/vboxpci.service
-
-%files kernel-init-guest
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/vboxguest
-%attr(754,root,root) /etc/rc.d/init.d/vboxsf
-%{systemdunitdir}/vboxguest.service
-%{systemdunitdir}/vboxsf.service
-
-%files -n kernel%{_alt_kernel}-misc-vboxguest
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxguest.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf
/lib/modules/%{_kernel_ver}/misc/vboxguest.ko*
+/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*
+/lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*
-%files -n kernel%{_alt_kernel}-misc-vboxdrv
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxdrv.conf
+%files -n kernel%{_alt_kernel}-virtualbox-host
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-host.conf
/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
-
-%files -n kernel%{_alt_kernel}-misc-vboxnetadp
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxnetadp.conf
/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*
-
-%files -n kernel%{_alt_kernel}-misc-vboxnetflt
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxnetflt.conf
/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
-
-%files -n kernel%{_alt_kernel}-misc-vboxpci
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxpci.conf
/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*
-
-%files -n kernel%{_alt_kernel}-misc-vboxsf
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxsf.conf
-%attr(755,root,root) %{_sbindir}/mount.vboxsf
-/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*
-
-%files -n kernel%{_alt_kernel}-misc-vboxvideo
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*
%endif
projects / packages / VirtualBox.git / blobdiff