diff options
author | 2013-02-28 16:01:02 +0000 | |
---|---|---|
committer | 2013-02-28 16:01:02 +0000 | |
commit | 995440455419c0609a1f232b0e26989105526348 (patch) | |
tree | 396bed72bb3ba765ebc7f5df1ee0efd2e3f49e41 /app-emulation | |
parent | Initial commit, wrt bug #459624 (diff) | |
download | gentoo-2-995440455419c0609a1f232b0e26989105526348.tar.gz gentoo-2-995440455419c0609a1f232b0e26989105526348.tar.bz2 gentoo-2-995440455419c0609a1f232b0e26989105526348.zip |
Version bump. Removed old.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/virtualbox-modules/ChangeLog | 10 | ||||
-rw-r--r-- | app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch | 56 | ||||
-rw-r--r-- | app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild | 59 | ||||
-rw-r--r-- | app-emulation/virtualbox-modules/virtualbox-modules-4.2.8.ebuild (renamed from app-emulation/virtualbox-modules/virtualbox-modules-4.2.4.ebuild) | 4 |
4 files changed, 11 insertions, 118 deletions
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog index 384a9b368dea..ac1144b8f54e 100644 --- a/app-emulation/virtualbox-modules/ChangeLog +++ b/app-emulation/virtualbox-modules/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/virtualbox-modules # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.121 2013/02/14 13:27:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.122 2013/02/28 16:01:02 polynomial-c Exp $ + +*virtualbox-modules-4.2.8 (28 Feb 2013) + + 28 Feb 2013; Lars Wendler <polynomial-c@gentoo.org> + -files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch, + -virtualbox-modules-4.1.22.ebuild, -virtualbox-modules-4.2.4.ebuild, + +virtualbox-modules-4.2.8.ebuild: + Version bump. Removed old. 14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> virtualbox-modules-4.1.24.ebuild: diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch deleted file mode 100644 index 172f0d6cd456..000000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://bugs.gentoo.org/389953 - ---- vboxpci/linux/VBoxPci-linux.c -+++ vboxpci/linux/VBoxPci-linux.c -@@ -33,14 +33,22 @@ - #include "VBoxPciInternal.h" - - #ifdef VBOX_WITH_IOMMU --#include <linux/dmar.h> --#include <linux/intel-iommu.h> --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) --# include <asm/amd_iommu.h> --#else --# include <linux/amd-iommu.h> --#endif --#endif -+# include <linux/dmar.h> -+# include <linux/intel-iommu.h> -+# include <linux/pci.h> -+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) -+# include <asm/amd_iommu.h> -+# else -+# include <linux/amd-iommu.h> -+# endif -+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) -+# define IOMMU_PRESENT() iommu_found() -+# define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc() -+# else -+# define IOMMU_PRESENT() iommu_present(&pci_bus_type) -+# define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc(&pci_bus_type) -+# endif -+#endif /* VBOX_WITH_IOMMU */ - - - /******************************************************************************* -@@ -146,7 +154,7 @@ - #endif - - #ifdef VBOX_WITH_IOMMU -- if (iommu_found()) -+ if (IOMMU_PRESENT()) - printk(KERN_INFO "vboxpci: IOMMU found\n"); - else - printk(KERN_INFO "vboxpci: IOMMU not found (not registered)\n"); -@@ -984,9 +992,9 @@ - printk(KERN_DEBUG "vboxPciOsInitVm: %p\n", pThis); - #endif - #ifdef VBOX_WITH_IOMMU -- if (iommu_found()) -+ if (IOMMU_PRESENT()) - { -- pThis->pIommuDomain = iommu_domain_alloc(); -+ pThis->pIommuDomain = IOMMU_DOMAIN_ALLOC(); - if (!pThis->pIommuDomain) - { - printk(KERN_DEBUG "cannot allocate IOMMU domain\n"); diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild deleted file mode 100644 index 422c353323d5..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2012 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.22.ebuild,v 1.3 2012/09/17 20:09:47 nativemad Exp $ - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from virtualbox-bin - -EAPI=4 - -inherit eutils linux-mod user - -MY_P=vbox-kernel-module-src-${PV} -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pax_kernel" - -RDEPEND="!=app-emulation/virtualbox-9999" - -S=${WORKDIR} - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})" - -pkg_setup() { - linux-mod_pkg_setup - - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" - enewgroup vboxusers -} - -src_prepare() { - if kernel_is -ge 2 6 33 ; then - # evil patch for new kernels - header moved - grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' - fi - - if use pax_kernel && kernel_is -ge 3 0 0 ; then - epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch - fi -} - -src_install() { - linux-mod_src_install -} - -pkg_postinst() { - linux-mod_pkg_postinst - elog "Starting with the 3.x release new kernel modules were added," - elog "be sure to load all the needed modules." - elog "" - elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:" - elog "/etc/conf.d/modules" -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.8.ebuild index cd9a3203b9f6..669c21ed99fa 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.4.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.2.4.ebuild,v 1.1 2012/11/10 21:07:51 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.8.ebuild,v 1.1 2013/02/28 16:01:02 polynomial-c Exp $ # XXX: the tarball here is just the kernel modules split out of the binary # package that comes from virtualbox-bin |