diff options
| author |   Justin Riley <justin.t.riley@gmail.com> | 2014-04-14 16:56:48 -0400 |
|---|---|---|
| committer | Justin Riley <justin.t.riley@gmail.com> | 2014-04-14 16:57:33 -0400 |
| commit | 9f301cd92f45496a3f958f049299e075d9a93328 (patch) | |
| tree | 538605b88664c98e75da344096b67c3898aec987 | |
| parent | add improved live ebuild for dev-lang/julia (diff) | |
| download | jtriley-9f301cd92f45496a3f958f049299e075d9a93328.tar.gz jtriley-9f301cd92f45496a3f958f049299e075d9a93328.tar.bz2 jtriley-9f301cd92f45496a3f958f049299e075d9a93328.zip | |
vmware-modules: add 3.12.13 patches to 279.1-r1
| -rw-r--r-- | app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-279.1.ebuild) | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild index f2428f3..c6e26c3 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1.ebuild,v 1.2 2013/11/23 14:05:03 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.1 2014/04/12 20:13:46 dilfridge Exp $ EAPI=5 @@ -17,7 +17,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel" +IUSE="pax_kernel +vmci +vsock" RDEPEND="" DEPEND="${RDEPEND} @@ -31,6 +31,16 @@ pkg_setup() { if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then CONFIG_CHECK="${CONFIG_CHECK} BKL" fi + if use vmci ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI" + fi + if use vsock ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS" + fi linux-info_pkg_setup @@ -38,7 +48,11 @@ pkg_setup() { VMWARE_GROUP=${VMWARE_GROUP:-vmware} - VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock" + VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock" + VMWARE_MODULE_LIST="vmblock vmmon vmnet" + use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" + use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock" + VMWARE_MOD_DIR="${PN}-${PVR}" BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" @@ -53,7 +67,7 @@ pkg_setup() { src_unpack() { cd "${S}" - for mod in ${VMWARE_MODULE_LIST}; do + for mod in ${VMWARE_MODULE_LIST_ALL}; do tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar done } @@ -65,10 +79,11 @@ src_prepare() { use pax_kernel && epatch "${FILESDIR}/279-hardened.patch" epatch "${FILESDIR}/${PV_MAJOR}-apic.patch" kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch" - kernel_is ge 3 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-userns.patch" kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch" + kernel_is ge 3 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-userns.patch" kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock-3.11.patch" - kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock-3.12.patch" + kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock-3.12.patch" + # Allow user patches so they can support RC kernels and whatever else epatch_user @@ -79,6 +94,7 @@ src_install() { local udevrules="${T}/60-vmware.rules" cat > "${udevrules}" <<-EOF KERNEL=="vmci", GROUP="vmware", MODE=660 + KERNEL=="vmw_vmci", GROUP="vmware", MODE=660 KERNEL=="vmmon", GROUP="vmware", MODE=660 KERNEL=="vsock", GROUP="vmware", MODE=660 EOF |