Accepting request 1224270 from Virtualization

- Use distro-default INSTALL_MOD_DIR for both kmp and for local-built files. Add host-source.patch [boo#1231346].

OBS-URL: https://build.opensuse.org/request/show/1224270
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=282

_scmsync.obsinfo

@@ -1,4 +1,4 @@
-mtime: 1729122806
+mtime: 1731600272
-commit: c70a6a774008dcadf1912bb83ebbccb4319c0cc4fe1987ab93396a21d6a61a1f
+commit: 4c36cc83be5d6e1240ac6cf08a2bdb3ff67b9ef1654da45716e02028e8a9d109
 url: https://src.opensuse.org/jengelh/virtualbox
 revision: master

build.specials.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f65de53e3e9d633f742a950043aab599c250afc82531c6ad4d70a81aafbee8e8
+oid sha256:168936ad6e1ac96b14a0b35b73922d80c6c4c3fc19f08374db48e8cd86bcd902
 size 256

host-source.patch

@@ -0,0 +1,48 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2024-11-14 15:11:28.216506193 +0100
+References: https://bugzilla.suse.com/1231346
+
+Stop overriding INSTALL_MOD_DIR, stop using a non-standard path.
+[MODULE_DIR is a 2.4ism and irrelevant here;
+but INSTALL_MOD_DIR affects the 2.6+ install alike.]
+
+---
+ src/VBox/Installer/linux/Makefile-footer.gmk |    2 +-
+ src/VBox/Installer/linux/Makefile-header.gmk |    4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+Index: VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-footer.gmk
+===================================================================
+--- VirtualBox-7.1.4.orig/src/VBox/Installer/linux/Makefile-footer.gmk
++++ VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-footer.gmk
+@@ -145,7 +145,7 @@ $(VBOXMOD_0_TARGET):
+ 	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
+ 
+ install: $(VBOXMOD_0_TARGET)
+-	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
++	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) modules_install
+ 
+ modules_install: install
+ 
+Index: VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-header.gmk
+===================================================================
+--- VirtualBox-7.1.4.orig/src/VBox/Installer/linux/Makefile-header.gmk
++++ VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-header.gmk
+@@ -261,8 +261,7 @@ endif
+ # Kernel include folder
+ KERN_INCL := $(KERN_DIR)/include
+ # module install folder
+-INSTALL_MOD_DIR ?= misc
+-MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
++MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/updates
+ 
+ # For VBOX_GCC_CHECK_CC
+ VBOX_CLOSEPAR := )
+@@ -298,7 +297,6 @@ endif
+ ifdef DEBUG
+  ifndef VBOX_KERN_QUIET
+ $(warning dbg: INSTALL_MOD_PATH = $(INSTALL_MOD_PATH))
+-$(warning dbg: INSTALL_MOD_DIR  = $(INSTALL_MOD_DIR))
+ $(warning dbg: KERN_DIR         = $(KERN_DIR))
+ $(warning dbg: KERN_INCL        = $(KERN_INCL))
+ $(warning dbg: KERN_VERSION     = $(KERN_VERSION))

virtualbox-kmp-files

@@ -1,9 +0,0 @@
-%defattr (-,root,root)
-%dir %{kernel_module_directory}/%2-%1/
-%dir %{kernel_module_directory}/%2-%1/extra
-%{kernel_module_directory}/%2-%1/extra/vboxdrv.ko
-%{kernel_module_directory}/%2-%1/extra/vboxnetadp.ko
-%{kernel_module_directory}/%2-%1/extra/vboxnetflt.ko
-%{kernel_module_directory}/%2-%1/extra/vboxguest.ko
-%{kernel_module_directory}/%2-%1/extra/vboxsf.ko
-%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko

virtualbox-kmp-preamble

@@ -1,4 +1,3 @@
 Requires: kernel-%1
-Provides: virtualbox-kmp = %version
+Enhances: kernel-%1
 Supplements: (virtualbox-guest-tools and kernel-%1)
-

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 14 16:03:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Use distro-default INSTALL_MOD_DIR for both kmp
+  and for local-built files. Add host-source.patch [boo#1231346].
+
 -------------------------------------------------------------------
 Wed Oct 16 23:37:43 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

virtualbox.spec

@@ -71,7 +71,6 @@ Source0:        VirtualBox-%{version}-patched.tpxz
 Source1:        UserManual.pdf
 Source3:        virtualbox-60-vboxguest.rules
 Source4:        virtualbox-default.virtualbox
-Source5:        virtualbox-kmp-files
 Source7:        virtualbox-kmp-preamble
 Source8:        update-extpack.sh
 Source9:        virtualbox-wrapper.sh
@@ -114,6 +113,7 @@ Patch9:         vbox-usb-warning.diff
 # Patch for 15.5
 Patch10:        fix_for_leap15.5.patch
 Patch11:        cxx17.patch
+Patch12:        host-source.patch
 #
 # Common BuildRequires for both virtualbox and virtualbox-kmp
 BuildRequires:  %{kernel_module_package_buildreqs}
@@ -127,8 +127,8 @@ BuildRequires:  dwarves
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-BuildRequires:  gcc11
+BuildRequires:  gcc12
-BuildRequires:  gcc11-c++
+BuildRequires:  gcc12-c++
 %endif
 BuildRequires:  kbuild >= 0.1.9998+svn3613
 BuildRequires:  libcap-devel
@@ -240,8 +240,8 @@ BuildRequires:  boost-devel
 BuildRequires:  gcc-32bit
 BuildRequires:  gcc-c++-32bit
 %else
-BuildRequires:  gcc11-32bit
+BuildRequires:  gcc12-32bit
-BuildRequires:  gcc11-c++-32bit
+BuildRequires:  gcc12-c++-32bit
 %endif
 BuildRequires:  xorg-x11-libX11-devel-32bit
 BuildRequires:  xorg-x11-libXext-devel-32bit
@@ -261,7 +261,7 @@ BuildRequires:  libpulse-devel
 BuildRequires:  libxml2-devel
 Requires:       ca-certificates
 Requires:       openSUSE-signkey-cert
-%kernel_module_package -p %{SOURCE7} -n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv
+%kernel_module_package -p %{SOURCE7} -n virtualbox -x kdump um xen pae xenpae pv
 # end of kmp_package
 %endif
 ### Description and subpackages of virtualbox main package ###
@@ -434,11 +434,11 @@ sed -i 's:include/drm:%{_prefix}/src/linux/include/drm:' src/VBox/Additions/linu
 %if %{main_package}
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 1600
-# kmk is annoying, does not respond to CXX=g++-11 ...
+# kmk is annoying, does not respond to CXX=g++-12 ...
 mkdir tc
 export PATH="$PWD/tc:$PATH"
-ln -s /usr/bin/gcc-11 tc/gcc
+ln -s /usr/bin/gcc-12 tc/gcc
-ln -s /usr/bin/g++-11 tc/g++
+ln -s /usr/bin/g++-12 tc/g++
 %endif
 # Disable LTO - Link Time Optimization
 	%define _lto_cflags %{nil}
@@ -1081,7 +1081,6 @@ done
 
 %install
 export INSTALL_MOD_PATH=%{buildroot}
-export INSTALL_MOD_DIR=extra
 #to install modules we use here similar steps like in build phase, go through all the modules :
 for module_name in vbox{drv,netflt,netadp,guest,sf,video}
 do