diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-10-19 17:02:24 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-10-19 17:02:24 +0000 |
| commit | dd79686078494cf845e24af4ff5ed319b89d43b7 (patch) | |
| tree | bd33859698829c367d46df41856f23f05912c2d7 /app-emulation/open-vm-tools-kmod | |
| parent | Cleanup malformed ChangeLog entries. (diff) | |
| download | gentoo-2-dd79686078494cf845e24af4ff5ed319b89d43b7.tar.gz gentoo-2-dd79686078494cf845e24af4ff5ed319b89d43b7.tar.bz2 gentoo-2-dd79686078494cf845e24af4ff5ed319b89d43b7.zip | |
Move module logic to pkg_setup and add checks for mainline config options.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'app-emulation/open-vm-tools-kmod')
| -rw-r--r-- | app-emulation/open-vm-tools-kmod/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild | 46 |
2 files changed, 32 insertions, 20 deletions
diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog index ca81efab97ff..ef77c39a3793 100644 --- a/app-emulation/open-vm-tools-kmod/ChangeLog +++ b/app-emulation/open-vm-tools-kmod/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/open-vm-tools-kmod # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.38 2013/10/19 16:32:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.39 2013/10/19 17:02:24 floppym Exp $ + + 19 Oct 2013; Mike Gilbert <floppym@gentoo.org> + open-vm-tools-kmod-2013.09.16.1328054.ebuild: + Move module logic to pkg_setup and add checks for mainline config options. 19 Oct 2013; Mike Gilbert <floppym@gentoo.org> +files/60-vmware.rules, -open-vm-tools-kmod-2012.10.14.874563.ebuild, diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild index 26c0b774ccb1..326561a30a99 100644 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild +++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.2 2013/10/19 16:30:10 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.3 2013/10/19 17:02:24 floppym Exp $ EAPI="5" @@ -19,36 +19,44 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 -" - S="${WORKDIR}/${MY_P}" -src_prepare() { - epatch "${FILESDIR}/frozen.patch" - epatch "${FILESDIR}/putname.patch" - epatch_user -} - -src_configure() { - export OVT_SOURCE_DIR="${S}" - export LINUXINCLUDE="${KV_OUT_DIR}/include" +pkg_setup() { + CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3" # See logic in configure.ac. local MODULES="vmxnet vmhgfs" - kernel_is -lt 3 9 && MODULES+=" vmci vsock" - kernel_is -lt 3 && MODULES+=" vmblock vmsync" + + if kernel_is -lt 3 9; then + MODULES+=" vmci vsock" + else + CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" + fi + + if kernel_is -lt 3; then + MODULES+=" vmblock vmsync" + else + CONFIG_CHECK+=" ~FUSE_FS" + fi local mod for mod in ${MODULES}; do MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})" done + linux-mod_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/frozen.patch" + epatch "${FILESDIR}/putname.patch" + epatch_user +} + +src_configure() { BUILD_TARGETS="auto-build" + export OVT_SOURCE_DIR="${S}" + export LINUXINCLUDE="${KV_OUT_DIR}/include" } src_install() { |