diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-11-06 13:16:19 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-11-06 13:16:19 +0000 |
| commit | 98af8134aaeaaf9a5002124f62c3998139e8e966 (patch) | |
| tree | a8de0b749db6610765dc82f47dd38bb74be8b665 /app-emulation | |
| parent | Marking HTML-Form-6.0.0 ppc for bug 386309 (diff) | |
| download | gentoo-2-98af8134aaeaaf9a5002124f62c3998139e8e966.tar.gz gentoo-2-98af8134aaeaaf9a5002124f62c3998139e8e966.tar.bz2 gentoo-2-98af8134aaeaaf9a5002124f62c3998139e8e966.zip | |
Added kernel version check for pax patch. Cleaned up 4.1.4 ebuild a bit
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
3 files changed, 14 insertions, 10 deletions
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog index ab4747cdd7e9..71fa00e7d369 100644 --- a/app-emulation/virtualbox-modules/ChangeLog +++ b/app-emulation/virtualbox-modules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/virtualbox-modules # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.93 2011/11/04 23:01:43 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.94 2011/11/06 13:16:19 polynomial-c Exp $ + + 06 Nov 2011; Lars Wendler <polynomial-c@gentoo.org> + virtualbox-modules-4.1.4.ebuild, virtualbox-modules-4.1.6.ebuild: + Added kernel version check for pax patch. Cleaned up 4.1.4 ebuild a bit. *virtualbox-modules-4.1.6 (04 Nov 2011) diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild index 596c3e1e380a..c22004db9908 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.3 2011/11/01 10:54:11 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.4 2011/11/06 13:16:19 polynomial-c Exp $ # XXX: the tarball here is just the kernel modules split out of the binary # package that comes from virtualbox-bin @@ -40,7 +40,9 @@ src_prepare() { grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' fi - use pax_kernel && epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + if use pax_kernel && kernel_is -ge 3 0 0 ; then + epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + fi } src_install() { @@ -53,9 +55,5 @@ pkg_postinst() { elog "be sure to load all the needed modules." elog "" elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:" - if has_version sys-apps/openrc; then - elog "/etc/conf.d/modules" - else - elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" - fi + elog "/etc/conf.d/modules" } diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild index 6fce566fc347..e0bf972fd60a 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.1 2011/11/04 23:01:43 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.2 2011/11/06 13:16:19 polynomial-c Exp $ # XXX: the tarball here is just the kernel modules split out of the binary # package that comes from virtualbox-bin @@ -40,7 +40,9 @@ src_prepare() { grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' fi - use pax_kernel && epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + if use pax_kernel && kernel_is -ge 3 0 0 ; then + epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + fi } src_install() { |