sys-kernel/virtualbox-{modules,guest}-dkms : improve dkms.conf

5 files changed, 38 insertions, 28 deletions

diff --git a/sys-kernel/virtualbox-guest-dkms/files/dkms.conf b/sys-kernel/virtualbox-guest-dkms/files/dkms.conf
new file mode 100644
index 00000000..5af9b9af
--- /dev/null
+++ b/sys-kernel/virtualbox-guest-dkms/files/dkms.conf
@@ -0,0 +1,30 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="virtualbox-guest-dkms"
+PACKAGE_VERSION=5.2.4
+AUTOINSTALL=yes
+
+MAKE[0]="make KVERSION=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="vboxguest"
+BUILT_MODULE_LOCATION[0]="vboxguest"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
+
+BUILT_MODULE_NAME[1]="vboxsf"
+BUILT_MODULE_LOCATION[1]="vboxsf"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
diff --git a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
deleted file mode 100644
index 86d19605..00000000
--- a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur a/dkms.conf b/dkms.conf
---- a/dkms.conf	2017-12-19 21:31:10.000000000 +0000
-+++ b/dkms.conf	2017-12-22 02:51:53.824679071 +0000
-@@ -15,7 +15,7 @@
- #
- 
- PACKAGE_NAME="vboxguest"
--PACKAGE_VERSION=5.2.4_OSE
-+PACKAGE_VERSION=5.2.4
- AUTOINSTALL=yes
- 
- BUILT_MODULE_NAME[0]="vboxguest"
-@@ -25,7 +25,3 @@
- BUILT_MODULE_NAME[1]="vboxsf"
- BUILT_MODULE_LOCATION[1]="vboxsf"
- DEST_MODULE_LOCATION[1]="/kernel/misc"
--
--BUILT_MODULE_NAME[2]="vboxvideo"
--BUILT_MODULE_LOCATION[2]="vboxvideo"
--DEST_MODULE_LOCATION[2]="/kernel/misc"
diff --git a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4-r1.ebuild
index c4823e9c..5a459561 100644
--- a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild
+++ b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4-r1.ebuild
@@ -20,18 +20,18 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/usr/src/vboxguest-${PV}_OSE
 
-src_prepare() {
-	epatch ${FILESDIR}/dkms.patch
-}
-
 src_compile() {
 	:
 }
 
 src_install() {
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
+	dodir usr/src/${P}
+	insinto usr/src/${P}
 	doins -r ${S}/*
+	# delete shipped dkms.conf
+	rm -rf ${ED}usr/src/${P}/dkms.conf
+	# inject our dkms.conf
+	doins ${FILESDIR}/dkms.conf
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
index 80cc6b40..b330bb9c 100644
--- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -2,7 +2,8 @@ PACKAGE_NAME="virtualbox-modules-dkms"
 PACKAGE_VERSION="5.2.4"
 AUTOINSTALL="yes"
 
-MAKE[0]="'make' -j`nproc` KERNEL_UNAME=${kernelver}"
+MAKE[0]="make KVERSION=$kernelver"
+CLEAN="make clean"
 
 BUILT_MODULE_NAME[0]="vboxdrv"
 DEST_MODULE_LOCATION[0]="/extra/dkms"
@@ -12,4 +13,3 @@ BUILT_MODULE_NAME[2]="vboxnetadp"
 DEST_MODULE_LOCATION[2]="/extra/dkms"
 BUILT_MODULE_NAME[3]="vboxpci"
 DEST_MODULE_LOCATION[3]="/extra/dkms"
-
diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4-r1.ebuild
index 00923566..00923566 100644
--- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild
+++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4-r1.ebuild