From 5bfba248d045469f0fae2581cc839005fdff4c163c9c38a814ba2b34118f5337 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 13 Oct 2021 02:42:15 +0000 Subject: [PATCH] Accepting request 924871 from home:lnussel:usrmove - Use kernel_module_directory macro for kernel modules (boo#1191526) OBS-URL: https://build.opensuse.org/request/show/924871 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=620 --- virtualbox-kmp-files | 16 ++++++++-------- virtualbox.changes | 5 +++++ virtualbox.spec | 5 ++++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/virtualbox-kmp-files b/virtualbox-kmp-files index ea938d2..a5114f7 100644 --- a/virtualbox-kmp-files +++ b/virtualbox-kmp-files @@ -1,10 +1,10 @@ %defattr (-,root,root) -%dir /lib/modules/%2-%1/ -%dir /lib/modules/%2-%1/extra -/lib/modules/%2-%1/extra/vboxdrv.ko -/lib/modules/%2-%1/extra/vboxnetadp.ko -/lib/modules/%2-%1/extra/vboxnetflt.ko -/lib/modules/%2-%1/extra/vboxsf.ko -/lib/modules/%2-%1/extra/vboxguest.ko -#/lib/modules/%2-%1/extra/vboxvideo.ko +%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/vboxsf.ko +%{kernel_module_directory}/%2-%1/extra/vboxguest.ko +#%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko diff --git a/virtualbox.changes b/virtualbox.changes index f41817c..1aa9b0b 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 12 13:03:59 UTC 2021 - Ludwig Nussel + +- Use kernel_module_directory macro for kernel modules (boo#1191526) + ------------------------------------------------------------------- Tue Oct 5 15:46:41 UTC 2021 - Hans-Peter Jansen diff --git a/virtualbox.spec b/virtualbox.spec index cc16d62..4acf098 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package virtualbox # # Copyright (c) 2021 SUSE LLC # @@ -24,6 +24,9 @@ %define dash - %define package_summary Kernel modules for VirtualBox %define package_group System/Kernel +%if %{undefined kernel_module_directory} +%define kernel_module_directory /lib/modules +%endif %else ### macros for virtualbox main package ### %define main_package 1