forked from pool/virtualbox
Accepting request 396646 from Virtualization
- remove libgsoap-devel from build deps, it conflicts with gsoap-devel (forwarded request 396645 from frispete) OBS-URL: https://build.opensuse.org/request/show/396646 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=116
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
4ab3efaec5
@ -1,5 +1,7 @@
|
||||
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig 2015-12-18 17:17:03.000000000 +0100
|
||||
+++ src/VBox/Additions/linux/installer/vboxadd.sh 2016-01-14 15:45:13.793994484 +0100
|
||||
Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
===================================================================
|
||||
--- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+++ VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
@@ -23,9 +23,12 @@
|
||||
# Provides: vboxadd
|
||||
# Required-Start:
|
||||
@ -14,7 +16,15 @@
|
||||
### END INIT INFO
|
||||
|
||||
PATH=$PATH:/bin:/sbin:/usr/sbin
|
||||
@@ -224,12 +227,6 @@
|
||||
@@ -148,7 +151,6 @@ fail()
|
||||
|
||||
dev=/dev/vboxguest
|
||||
userdev=/dev/vboxuser
|
||||
-config=/var/lib/VBoxGuestAdditions/config
|
||||
owner=vboxadd
|
||||
group=1
|
||||
|
||||
@@ -226,12 +228,6 @@ do_vboxguest_non_udev()
|
||||
fail "Cannot create device $dev with major $maj and minor $min"
|
||||
}
|
||||
fi
|
||||
@ -27,7 +37,7 @@
|
||||
|
||||
if [ ! -c $userdev ]; then
|
||||
maj=10
|
||||
@@ -240,12 +237,6 @@
|
||||
@@ -242,12 +238,6 @@ do_vboxguest_non_udev()
|
||||
rmmod vboxguest 2>/dev/null
|
||||
fail "Cannot create device $userdev with major $maj and minor $min"
|
||||
}
|
||||
@ -40,21 +50,39 @@
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -260,6 +251,13 @@
|
||||
fi
|
||||
test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
|
||||
fail "Configuration file $config not complete"
|
||||
+
|
||||
+ if [ -x /usr/bin/systemd-detect-virt ]; then
|
||||
+ if [ "x$(systemd-detect-virt)" != "xoracle" ]; then
|
||||
+ fail "Not running on a virtualbox guest"
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
@@ -255,13 +245,6 @@ do_vboxguest_non_udev()
|
||||
start()
|
||||
{
|
||||
begin "Starting the VirtualBox Guest Additions ";
|
||||
- if test -r $config; then
|
||||
- . $config
|
||||
- else
|
||||
- fail "Configuration file $config not found"
|
||||
- fi
|
||||
- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
|
||||
- fail "Configuration file $config not complete"
|
||||
uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
|
||||
ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
|
||||
no_udev=1
|
||||
@@ -470,33 +468,8 @@
|
||||
@@ -300,7 +283,7 @@ start()
|
||||
$MODPROBE vboxvideo > /dev/null 2>&1
|
||||
|
||||
# Put the X.Org driver in place. This is harmless if it is not needed.
|
||||
- /sbin/rcvboxadd-x11 setup
|
||||
+# /sbin/rcvboxadd-x11 setup
|
||||
# Install the guest OpenGL drivers. For now we don't support
|
||||
# multi-architecture installations
|
||||
rm -rf /etc/ld.so.conf.d/00vboxvideo.conf
|
||||
@@ -475,7 +458,7 @@ extra_setup()
|
||||
ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
|
||||
# And an rc file to re-build the kernel modules and re-set-up the X server.
|
||||
ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
|
||||
- ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
|
||||
+# ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
|
||||
# At least Fedora 11 and Fedora 12 require the correct security context when
|
||||
# executing this command from service scripts. Shouldn't hurt for other
|
||||
# distributions.
|
||||
@@ -497,49 +480,13 @@ extra_setup()
|
||||
# setup_script
|
||||
setup()
|
||||
{
|
||||
@ -90,3 +118,34 @@
|
||||
}
|
||||
|
||||
# cleanup_script
|
||||
cleanup()
|
||||
{
|
||||
- if test -r $config; then
|
||||
- . $config
|
||||
- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
|
||||
- fail "Configuration file $config not complete"
|
||||
- DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
|
||||
- elif test -x ./do_dkms; then # Executing as part of the installer...
|
||||
- DODKMS=./do_dkms
|
||||
- else
|
||||
- fail "Configuration file $config not found"
|
||||
- fi
|
||||
-
|
||||
# Delete old versions of VBox modules.
|
||||
cleanup_modules
|
||||
depmod
|
||||
@@ -550,12 +497,12 @@ cleanup()
|
||||
done
|
||||
|
||||
# Clean-up X11-related bits
|
||||
- /sbin/rcvboxadd-x11 cleanup
|
||||
+# /sbin/rcvboxadd-x11 cleanup
|
||||
|
||||
# Remove other files
|
||||
rm /sbin/mount.vboxsf 2>/dev/null
|
||||
rm /sbin/rcvboxadd 2>/dev/null
|
||||
- rm /sbin/rcvboxadd-x11 2>/dev/null
|
||||
+# rm /sbin/rcvboxadd-x11 2>/dev/null
|
||||
rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 18 14:09:11 UTC 2016 - hpj@urpla.net
|
||||
|
||||
- remove libgsoap-devel from build deps, it conflicts with gsoap-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 8 18:19:23 UTC 2016 - Larry.Finger@lwfinger.net
|
||||
|
||||
- Fix start failure of vboxadd service routine (boo #977328). With this change, automounting of shared folders works again.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 26 11:23:41 UTC 2016 - eich@suse.com
|
||||
|
||||
|
||||
@ -111,7 +111,6 @@ BuildRequires: kbuild >= 0.1.9998svn2689
|
||||
BuildRequires: kernel-syms
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcurl-devel
|
||||
#BuildRequires: libgsoap-devel
|
||||
BuildRequires: libidl-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libqt4-devel
|
||||
@ -303,7 +302,7 @@ This package contains icons for guest desktop files that were created on the des
|
||||
%prep
|
||||
%setup -q -n VirtualBox-%{version}
|
||||
%patch1
|
||||
%patch2
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
@ -386,7 +385,7 @@ echo "build basic parts"
|
||||
#
|
||||
# build kernel modules for guest and host (check novel-kmp package as example)
|
||||
# host modules : vboxdrv,vboxnetflt,vboxnetadp
|
||||
# guest modules : vboxguest,vboxsf,vboxvideo
|
||||
# guest modules : vboxguest,vboxsf,vboxvideo, vboxpci
|
||||
echo "build kernel modules"
|
||||
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
|
||||
out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
|
||||
@ -471,6 +470,8 @@ install -m 755 out/linux.*/release/bin/additions/VBoxService %{buildroot}%{_sbin
|
||||
install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}/sbin/mount.vboxsf
|
||||
install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd
|
||||
install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-service
|
||||
install -D -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}/opt/VBoxGuestAdditions-%{version}/init/vboxadd
|
||||
install -D -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}/opt/VBoxGuestAdditions-%{version}/init/vboxadd-service
|
||||
ln -s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd
|
||||
ln -s %{_sysconfdir}/init.d/vboxadd-service %{buildroot}%{_sbindir}/rcvboxadd-service
|
||||
# udev rule for guest (virtualbox-guest-tools)
|
||||
@ -819,6 +820,10 @@ exit 0
|
||||
%config %{_sysconfdir}/init.d/vboxadd-service
|
||||
%{_sbindir}/rcvboxadd
|
||||
%{_sbindir}/rcvboxadd-service
|
||||
%dir /opt/VBoxGuestAdditions-%{version}
|
||||
%dir /opt/VBoxGuestAdditions-%{version}/init
|
||||
/opt/VBoxGuestAdditions-%{version}/init/vboxadd
|
||||
/opt/VBoxGuestAdditions-%{version}/init/vboxadd-service
|
||||
%if 0%{?suse_version} > 1310
|
||||
%dir /media
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user