From 1a341ecbdf823a7c2fa1731a820ad525a7ee504b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 21 Apr 2016 13:38:01 +0000 Subject: main/open-vm-tools-grsec: fix build --- ...ix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch | 34 ------------------- main/open-vm-tools-grsec/APKBUILD | 39 +++++++++++++--------- main/open-vm-tools-grsec/gcc5-x86.patch | 13 -------- main/open-vm-tools-grsec/vmware-modules.initd | 25 -------------- 4 files changed, 23 insertions(+), 88 deletions(-) delete mode 100644 main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch delete mode 100644 main/open-vm-tools-grsec/gcc5-x86.patch delete mode 100644 main/open-vm-tools-grsec/vmware-modules.initd (limited to 'main') diff --git a/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch b/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch deleted file mode 100644 index 53ccc3485d..0000000000 --- a/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8df98f3c779fa43d073a42e82bd18cf28c2bd4af Mon Sep 17 00:00:00 2001 -From: Wendell Smith -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 - diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 27bff01539..8235279c18 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -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<