[packages/VirtualBox] deterministically prefer vendor shipped module over mainline
atler
atler at pld-linux.org
Sun Mar 31 14:12:46 CEST 2019
commit 8b840295ee90b5a77fb81a805bf7c77b60118f6d
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Mar 31 14:10:02 2019 +0200
deterministically prefer vendor shipped module over mainline
VirtualBox.spec | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f34fb9a..636ec5f 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -479,6 +479,9 @@ gospodarzem sprzętu PCI.\
%if %{with kernel}\
%files -n kernel%{_alt_kernel}-virtualbox-guest\
%defattr(644,root,root,755)\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+%config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
/lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
@@ -529,6 +532,13 @@ cd ../..\
%endif\
%{nil}
+%define install_kernel_pkg()\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+install -d PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}\
+echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
+%{nil}
+
%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
@@ -641,6 +651,7 @@ kmk %{?_smp_mflags}
%endif
%{?with_kernel:%{expand:%build_kernel_packages}}
+%{?with_kernel:%{expand:%install_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/8b840295ee90b5a77fb81a805bf7c77b60118f6d
More information about the pld-cvs-commit
mailing list