From 41a627715cd5b974163f71e16006b80098e1fe35 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Apr 2018 17:57:03 +0100 Subject: sys-kernel/virtualbox-{modules,guest}-dkms : improve dkms.conf --- sys-kernel/virtualbox-guest-dkms/files/dkms.conf | 30 +++++++++++++++ sys-kernel/virtualbox-guest-dkms/files/dkms.patch | 20 ---------- .../virtualbox-guest-dkms-5.2.4-r1.ebuild | 43 +++++++++++++++++++++ .../virtualbox-guest-dkms-5.2.4.ebuild | 43 --------------------- sys-kernel/virtualbox-modules-dkms/files/dkms.conf | 4 +- .../virtualbox-modules-dkms-5.2.4-r1.ebuild | 45 ++++++++++++++++++++++ .../virtualbox-modules-dkms-5.2.4.ebuild | 45 ---------------------- 7 files changed, 120 insertions(+), 110 deletions(-) create mode 100644 sys-kernel/virtualbox-guest-dkms/files/dkms.conf delete mode 100644 sys-kernel/virtualbox-guest-dkms/files/dkms.patch create mode 100644 sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4-r1.ebuild delete mode 100644 sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild create mode 100644 sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4-r1.ebuild delete mode 100644 sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild (limited to 'sys-kernel') 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-r1.ebuild b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4-r1.ebuild new file mode 100644 index 00000000..5a459561 --- /dev/null +++ b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="Kernel Modules (guest) source for Virtualbox" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://mirror.archlinux.ro/archlinux/community/os/x86_64/${P}-1-x86_64.pkg.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/usr/src/vboxguest-${PV}_OSE + +src_compile() { + : +} + +src_install() { + 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() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} 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.ebuild deleted file mode 100644 index c4823e9c..00000000 --- a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="Kernel Modules (guest) source for Virtualbox" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://mirror.archlinux.ro/archlinux/community/os/x86_64/${P}-1-x86_64.pkg.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="sys-kernel/dkms" -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} - doins -r ${S}/* -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} 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-r1.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4-r1.ebuild new file mode 100644 index 00000000..00923566 --- /dev/null +++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +MY_P=vbox-kernel-module-src-${PV} +DESCRIPTION="Kernel Modules source for Virtualbox" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +S=${WORKDIR} + +src_prepare() { + grep -lR linux/autoconf.h * | xargs sed -i -e 's:::' +} + +src_compile() { + : +} + +src_install() { + cp ${FILESDIR}/dkms.conf ${S} + dodir /usr/src/${P} + insinto /usr/src/${P} + doins -r ${S}/* +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} 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.ebuild deleted file mode 100644 index 00923566..00000000 --- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -MY_P=vbox-kernel-module-src-${PV} -DESCRIPTION="Kernel Modules source for Virtualbox" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -S=${WORKDIR} - -src_prepare() { - grep -lR linux/autoconf.h * | xargs sed -i -e 's:::' -} - -src_compile() { - : -} - -src_install() { - cp ${FILESDIR}/dkms.conf ${S} - dodir /usr/src/${P} - insinto /usr/src/${P} - doins -r ${S}/* -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} -- cgit v1.2.3