From 3558be706c4e44013deff99e45241c3621247d3eb12154b54e5d97ec8a4fd6bc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 14 Nov 2024 00:36:58 +0000 Subject: [PATCH] [info=b439cb0a114003735dc2cf4761decb52100d329c2a1c17de20cc397a9aaf7b09] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=753 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- virtualbox-kmp-files | 9 --------- virtualbox-kmp-preamble | 3 +-- virtualbox.changes | 5 +++++ virtualbox.spec | 4 +--- 6 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 virtualbox-kmp-files diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index f2212d5..7805ad7 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1729122806 -commit: c70a6a774008dcadf1912bb83ebbccb4319c0cc4fe1987ab93396a21d6a61a1f +mtime: 1731544481 +commit: b439cb0a114003735dc2cf4761decb52100d329c2a1c17de20cc397a9aaf7b09 url: https://src.opensuse.org/jengelh/virtualbox revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 9742ea0..040f3d2 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f65de53e3e9d633f742a950043aab599c250afc82531c6ad4d70a81aafbee8e8 +oid sha256:9b44d0c1f665b7fea364e1d57efec8a589146ad8401fa6ce2a940a9e1cdfa26c size 256 diff --git a/virtualbox-kmp-files b/virtualbox-kmp-files deleted file mode 100644 index 576852d..0000000 --- a/virtualbox-kmp-files +++ /dev/null @@ -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 diff --git a/virtualbox-kmp-preamble b/virtualbox-kmp-preamble index ae8b973..7b471d6 100644 --- a/virtualbox-kmp-preamble +++ b/virtualbox-kmp-preamble @@ -1,4 +1,3 @@ Requires: kernel-%1 -Provides: virtualbox-kmp = %version +Enhances: kernel-%1 Supplements: (virtualbox-guest-tools and kernel-%1) - diff --git a/virtualbox.changes b/virtualbox.changes index faefffc..25cc97d 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 00:33:23 UTC 2024 - Jan Engelhardt + +- Use distro-default INSTALL_MOD_DIR. + ------------------------------------------------------------------- Wed Oct 16 23:37:43 UTC 2024 - Jan Engelhardt diff --git a/virtualbox.spec b/virtualbox.spec index 40408db..a7652da 100644 --- a/virtualbox.spec +++ b/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 @@ -261,7 +260,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 ### @@ -1081,7 +1080,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