diff options
author | Vadim Kuznetsov <vadimk@gentoo.org> | 2012-11-11 15:18:36 -0500 |
---|---|---|
committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2012-11-11 15:18:36 -0500 |
commit | 18ba5b4e14eae247667aef20dea061204f0183a8 (patch) | |
tree | f64cc8c45b5bac90266e0ce857cad8760c665ba8 /app-emulation/open-vm-tools-kmod | |
parent | unmasking vmware desktop 9 (diff) | |
download | vmware-18ba5b4e14eae247667aef20dea061204f0183a8.tar.gz vmware-18ba5b4e14eae247667aef20dea061204f0183a8.tar.bz2 vmware-18ba5b4e14eae247667aef20dea061204f0183a8.zip |
open-vm-tools: version bump
Diffstat (limited to 'app-emulation/open-vm-tools-kmod')
5 files changed, 186 insertions, 2 deletions
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest index 754b3e5..55154fc 100644 --- a/app-emulation/open-vm-tools-kmod/Manifest +++ b/app-emulation/open-vm-tools-kmod/Manifest @@ -1,2 +1,4 @@ DIST open-vm-tools-2012.05.21-724730.tar.gz 3567582 SHA256 c7daaaf0ed031cd36295cf10d51dbbdedeb1eb0015e49f0806620792f8dab71b SHA512 54f3d1f052720994432c2b657d8f6c3b16a90aae39e9fec2671def34d57019b58e1f4a8e626b390a79de5d33665a2f8f76e42b9ef110ecb46dddfd27538cd6e7 WHIRLPOOL eaf241384222c0d3591ddc6fda2fa4e5d4ed3ca524309673779685e34f30b1b241bd844f99ed5eb104f60bec7f822db96d09a21a8107b8620213fd4a0aeb57d8 +DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56 +DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872 diff --git a/app-emulation/open-vm-tools-kmod/files/frozen.patch b/app-emulation/open-vm-tools-kmod/files/frozen.patch new file mode 100644 index 0000000..8b3fd7f --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/files/frozen.patch @@ -0,0 +1,28 @@ +diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c +--- a/modules/linux/vmsync/sync.c 2012-08-01 19:02:59.000000000 -0700 ++++ b/modules/linux/vmsync/sync.c 2012-10-14 07:38:18.000000000 -0700 +@@ -162,7 +162,11 @@ VmSyncThawDevices(void *_state) // IN + cancel_delayed_work(&state->thawTask); + list_for_each_safe(cur, tmp, &state->devices) { + dev = list_entry(cur, VmSyncBlockDevice, list); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) ++ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) { ++#else + if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) { ++#endif + thaw_bdev(dev->bdev, dev->sb); + atomic_dec(&gFreezeCount); + } +@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state, + * the superblock is already frozen. + */ + if (inode->i_sb->s_bdev == NULL || ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) ++ inode->i_sb->s_writers.frozen != SB_UNFROZEN) { ++#else + inode->i_sb->s_frozen != SB_UNFROZEN) { ++#endif + result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY; + compat_path_release(&nd); + goto exit; + diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild new file mode 100644 index 0000000..d64fc7a --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2012 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-2012.05.21.724730.ebuild,v 1.1 2012/06/02 14:45:23 vadimk Exp $ + +EAPI="4" + +inherit eutils linux-info linux-mod versionator + +MY_PN="${PN/-kmod}" +MY_PV="$(replace_version_separator 3 '-')" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="http://open-vm-tools.sourceforge.net/" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" + +DEPEND="${RDEPEND} + virtual/linux-sources + " + +CONFIG_CHECK=" + ~DRM_VMWGFX + ~VMWARE_BALLOON + ~VMWARE_PVSCSI + ~VMXNET3 + " + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + linux-mod_pkg_setup + + VMWARE_MOD_DIR="modules/linux" + VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" + + MODULE_NAMES="" + BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" + + for mod in ${VMWARE_MODULE_LIST}; + do + if [ "${mod}" == "vmxnet" ]; + then + MODTARGET="net" + else + MODTARGET="openvmtools" + fi + MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" + done +} + +src_prepare() { + sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ + || die "Sed failed." + epatch "${FILESDIR}/frozen.patch" +} + +src_configure() { + : # do nothing at all +} + +src_install() { + linux-mod_src_install + + local udevrules="${T}/60-vmware.rules" + cat > "${udevrules}" <<-EOF + KERNEL=="vsock", GROUP="vmware", MODE=660 + EOF + insinto /lib/udev/rules.d/ + doins "${udevrules}" +} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild index 86af76f..0aad33e 100644 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild +++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 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-8.8.1.528969.ebuild,v 1.2 2012/02/04 16:34:59 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild,v 1.2 2012/05/31 23:14:43 zmedico Exp $ EAPI="4" -inherit linux-info linux-mod versionator +inherit eutils linux-info linux-mod versionator MY_PN="${PN/-kmod}" MY_PV="$(replace_version_separator 3 '-')" diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild new file mode 100644 index 0000000..e528d56 --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2012 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-8.8.2.590212-r1.ebuild,v 1.2 2012/05/31 23:14:43 zmedico Exp $ + +EAPI="4" + +inherit eutils linux-info linux-mod versionator + +MY_PN="${PN/-kmod}" +MY_PV="$(replace_version_separator 3 '-')" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="http://open-vm-tools.sourceforge.net/" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" + +DEPEND="${RDEPEND} + virtual/linux-sources + " +CONFIG_CHECK=" + ~DRM_VMWGFX + ~VMWARE_BALLOON + ~VMWARE_PVSCSI + ~VMXNET3 + " + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + linux-mod_pkg_setup + + VMWARE_MOD_DIR="modules/linux" + VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" + + MODULE_NAMES="" + BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" + + for mod in ${VMWARE_MODULE_LIST}; + do + if [ "${mod}" == "vmxnet" ]; + then + MODTARGET="net" + else + MODTARGET="openvmtools" + fi + MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" + done +} + +src_prepare() { + sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ + || die "Sed failed." + #kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch" + epatch "${FILESDIR}/frozen.patch" +} + +src_configure() { + : # do nothing at all +} + +src_install() { + linux-mod_src_install + + local udevrules="${T}/60-vmware.rules" + cat > "${udevrules}" <<-EOF + KERNEL=="vsock", GROUP="vmware", MODE=660 + EOF + insinto /lib/udev/rules.d/ + doins "${udevrules}" +} |