f0db97f1a1
Fixes boo#1205868 - VirtualBox 7.0.4 crashes when machine log is requested from GUI Deleted file "VBoxDDR0.r0" - no longer needed. Deleted file "Fix_for_server_1.19.patch" - no longer needed. Deleted file "fixes_for_Qt5.11.patch" - no longer needed. Deleted file "fix_lib_search.patch" - no longer needed. Deleted file "fixes_for_Leap42.3.patch" - target is obsolete. Deleted file "set_noexec_stack.patch" - not needed. Deleted file "fix_v7_build.patch" - not needed. Deleted file "fixes_for_gcc10.patch" - not needed. Deleted file "internal-headers.patch" - not needed. OBS-URL: https://build.opensuse.org/request/show/1039144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=667
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
|
|
===================================================================
|
|
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/vboxdrv.sh
|
|
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
|
|
@@ -29,11 +29,12 @@
|
|
#
|
|
### BEGIN INIT INFO
|
|
# Provides: vboxdrv
|
|
-# Required-Start: $syslog
|
|
-# Required-Stop:
|
|
-# Default-Start: 2 3 4 5
|
|
+# Required-Start: $syslog $remote_fs
|
|
+# Required-Stop: $syslog $remote_fs
|
|
+# Default-Start: 2 3 5
|
|
# Default-Stop: 0 1 6
|
|
-# Short-Description: VirtualBox Linux kernel module
|
|
+# Short-Description: VirtualBox Linux module
|
|
+# Description: VirtualBox Linux kernel module
|
|
### END INIT INFO
|
|
|
|
## @todo This file duplicates a lot of script with vboxadd.sh. When making
|
|
@@ -520,13 +521,6 @@ See the documentation for your Linux dis
|
|
fi
|
|
fi
|
|
# ensure permissions
|
|
- if ! chown :"${GROUP}" $DEVICE 2>/dev/null; then
|
|
- rmmod vboxpci 2>/dev/null
|
|
- rmmod vboxnetadp 2>/dev/null
|
|
- rmmod vboxnetflt 2>/dev/null
|
|
- rmmod vboxdrv 2>/dev/null
|
|
- failure "Cannot change group ${GROUP} for device $DEVICE"
|
|
- fi
|
|
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
|
|
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
|
|
fi
|
|
@@ -684,31 +678,7 @@ setup()
|
|
log "Error building the module:"
|
|
module_build_log "$myerr"
|
|
failure "Look at $LOG to find out what went wrong"
|
|
- fi
|
|
- log "Building the net adaptor module."
|
|
- if ! myerr=`$BUILDINTMP \
|
|
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
|
|
- --module-source "$MODULE_SRC/vboxnetadp" \
|
|
- --no-print-directory install 2>&1`; then
|
|
- log "Error building the module:"
|
|
- module_build_log "$myerr"
|
|
- failure "Look at $LOG to find out what went wrong"
|
|
- fi
|
|
- if test -e "$MODULE_SRC/vboxpci"; then
|
|
- log "Building the PCI pass-through module."
|
|
- if ! myerr=`$BUILDINTMP \
|
|
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
|
|
- --module-source "$MODULE_SRC/vboxpci" \
|
|
- --no-print-directory install 2>&1`; then
|
|
- log "Error building the module:"
|
|
- module_build_log "$myerr"
|
|
- failure "Look at $LOG to find out what went wrong"
|
|
- fi
|
|
- fi
|
|
- rm -f /etc/vbox/module_not_compiled
|
|
- depmod -a
|
|
- sync
|
|
- succ_msg "VirtualBox kernel modules built"
|
|
+ /sbin/vboxconfig
|
|
|
|
# Secure boot on Ubuntu, Debian and Oracle Linux.
|
|
if test -n "$HAVE_SEC_BOOT"; then
|
|
Index: VirtualBox-7.0.4/Config.kmk
|
|
===================================================================
|
|
--- VirtualBox-7.0.4.orig/Config.kmk
|
|
+++ VirtualBox-7.0.4/Config.kmk
|
|
@@ -3111,6 +3111,9 @@ else
|
|
$(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
|
|
endif
|
|
endif
|
|
+ifndef VBOX_GCC_std
|
|
+ VBOX_GCC_std := -std=c++17
|
|
+endif
|
|
|
|
# YASM macros
|
|
ifndef DONT_USE_YASM
|