Commit 1a341ecb authored by Natanael Copa's avatar Natanael Copa
Browse files

main/open-vm-tools-grsec: fix build

parent 781e4620
From 8df98f3c779fa43d073a42e82bd18cf28c2bd4af Mon Sep 17 00:00:00 2001
From: Wendell Smith <wendellwsmith@gmail.com>
Date: Sat, 7 Feb 2015 15:42:13 -0500
Subject: [PATCH 2/3] Fix d_alias to d_u.d_alias for kernel 3.18
---
open-vm-tools/modules/linux/vmhgfs/inode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/open-vm-tools/modules/linux/vmhgfs/inode.c b/open-vm-tools/modules/linux/vmhgfs/inode.c
index 77b1669..2d289e3 100644
--- a/modules/linux/vmhgfs/inode.c
+++ b/modules/linux/vmhgfs/inode.c
@@ -1917,7 +1917,7 @@ HgfsPermission(struct inode *inode,
p,
#endif
&inode->i_dentry,
- d_alias) {
+ d_u.d_alias) {
int dcount = hgfs_d_count(dentry);
if (dcount) {
LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
@@ -1970,7 +1970,7 @@ HgfsPermission(struct inode *inode,
/* Find a dentry with valid d_count. Refer bug 587879. */
list_for_each(pos, &inode->i_dentry) {
int dcount;
- struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
+ struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
dcount = hgfs_d_count(dentry);
if (dcount) {
LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
--
2.3.4
......@@ -5,7 +5,7 @@ _kpkg=linux-$_flavor
_realname=open-vm-tools
_kver=4.4.8
_kpkgrel=0
_realver=10.0.0_p3000743
_realver=10.0.7
_ver=${_realver/_p/-}
_mypkgrel=0
......@@ -31,20 +31,19 @@ pkgver=$_kver
pkgrel=$(($_kpkgrel + $_mypkgrel))
pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
url="http://open-vm-tools.sourceforge.net/"
#arch="x86 x86_64"
arch=""
url="https://github.com/vmware/open-vm-tools/"
arch="x86 x86_64"
license="LGPL"
subpackages=""
depends="linux-${_flavor}=${_kernelver}"
depends_dev="bash glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
makedepends="$depends_dev autoconf automake libtool linux-headers"
source="https://github.com/vmware/open-vm-tools/archive/open-vm-tools-${_ver}.tar.gz
vmware-modules.initd
source="https://github.com/vmware/open-vm-tools/archive/stable-$_ver.tar.gz
0001-Fix-vmxnet-module-on-kernels-3.16.patch
"
install_if="linux-${_flavor}=${_kernelver} open-vm-tools"
_builddir="$srcdir/open-vm-tools-open-vm-tools-$_ver"/open-vm-tools
_builddir="$srcdir/open-vm-tools-stable-$_ver"/open-vm-tools
prepare() {
cd "$_builddir"
......@@ -54,7 +53,7 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
# libtoolize && aclocal && autoconf && automake --add-missing
libtoolize && aclocal && autoconf && automake --add-missing
}
build() {
......@@ -78,8 +77,16 @@ build() {
package() {
cd "$_builddir"
install -D -m755 "$srcdir"/vmware-modules.initd \
"$pkgdir"/etc/init.d/vmware-modules-${_flavor} || return 1
mkdir -p "$pkgdir"/etc/modules-load.d/
cat >"$pkgdir"/etc/modules-load.d/open-vm-tools<<EOF
vmblock
vmci
vmhgfs
vmsync
vmxnet
vsock
vmw_balloon
EOF
mkdir -p $pkgdir/lib/modules/${_abi_release}/misc/
cd "$_builddir"/modules
for module in `find . -type f -name '*.ko'`; do
......@@ -87,9 +94,9 @@ package() {
done
}
md5sums="13b508201e3285c5f404b24f992936f8 open-vm-tools-10.0.0-3000743.tar.gz
468a05614187bef0664c238811e7fae9 vmware-modules.initd"
sha256sums="8765784d85e4a39b08f1cbc2fb9bbb920027d5fa0abb9b99cec4a886a793ad94 open-vm-tools-10.0.0-3000743.tar.gz
67217fb71ffceb3eed2a55ae47fe1411f67a0bf4563b86741768dc6d77f82760 vmware-modules.initd"
sha512sums="25428a4982fa19208f915fd58067a5aa9a8427b2ff8c3f06889194cdd4792489911232c3cd94ea54f5000c47ca915debd33ee0441579adf50f183b74def5cd45 open-vm-tools-10.0.0-3000743.tar.gz
aa3524324274413ae016ba2e660bdab5c2bc95712c131cadd99fdb463ad30279b6b80e5b61eb002fedf348e56fb31586e2695d8be0c52e5c7fcb4a15f275985f vmware-modules.initd"
md5sums="f865c9cfc9732360f6e1b08cdbd16483 stable-10.0.7.tar.gz
3254b99481cea970acd6d65863ce6b48 0001-Fix-vmxnet-module-on-kernels-3.16.patch"
sha256sums="87d76dc3affd39dccfae80c7210ac89e8f14cb493a651709780f67b1b5a92ec8 stable-10.0.7.tar.gz
85be67ed9827e685d55dd5cba25144d95296159ff1be73f491b343c395dd6a7d 0001-Fix-vmxnet-module-on-kernels-3.16.patch"
sha512sums="d91fcc9a30ba6fbe34ea8440106ef3d9c0b9bf04e5c40a787179735f534f93a1aaff43fb3b91fe33377b00b84f07b2dc91d7129cf0bbf82774b04a19a531223f stable-10.0.7.tar.gz
c445631b7faf8badfbf8e66518bfb70aec1049c1a0393ff038253e70190d7f8580cbcd3e7037c43664ee0ee48d26edd8f8eaca06383bbd7fa763a182050f9551 0001-Fix-vmxnet-module-on-kernels-3.16.patch"
http://sourceforge.net/p/open-vm-tools/mailman/message/34016246/
--- ./lib/include/vm_basic_asm_x86.h.orig
+++ ./lib/include/vm_basic_asm_x86.h
@@ -436,7 +436,7 @@
#pragma warning(default: 4035)
#else
#define MUL64_NO_ASM 1
-#include "mul64.h"
+//#include "mul64.h"
#endif
/*
#!/sbin/openrc-run
MODULES="vmblock vmci vmhgfs vmsync vmxnet vsock vmw_balloon"
depend() {
before open-vm-tools
}
start() {
ebegin "Loading VMware kernel modules"
for mod in $MODULES; do
modprobe -q $mod
done
eend $?
}
stop() {
ebegin "Unloading VMware kernel modules"
for mod in $MODULES; do
rmmod $mod
done
eend $?
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment