Dominique Leuenberger
70390920d1
Updating to version 9.10.0. Highlights include: - Update to open-vm-tools-9.10.0-2476743: - Build using gcc4.7 for SLES11 environments to avoid mul64.h dependency problem for i586 architectures (Note - This prevents building on <= SLES11SP2) - Add libmspack BuildRequires (required by deploypkg). - Add openssl BuildRequires (required by grabbitmqproxy and vgauth). - Compile using --without-xmlsecurity and --without-xerces as pkgconfig(xml-security-c) is not yet available in the build service, (this disables vgauth support). - Disable deploypkg for older versions of SLES and openSUSE. - Disable ssl for older versions of SLES and openSUSE (this disables grabbitmqproxy and vgauth). - Update spec file to be compatible with SLES and openSUSE. OBS-URL: https://build.opensuse.org/request/show/309111 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=294
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
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
|
|
|
|
---
|
|
a/modules/linux/vmhgfs/inode.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: open-vm-tools-9.10.0-2476743/modules/linux/vmhgfs/inode.c
|
|
===================================================================
|
|
--- open-vm-tools-9.10.0-2476743.orig/modules/linux/vmhgfs/inode.c
|
|
+++ open-vm-tools-9.10.0-2476743/modules/linux/vmhgfs/inode.c
|
|
@@ -1917,7 +1917,12 @@ HgfsPermission(struct inode *inode,
|
|
p,
|
|
#endif
|
|
&inode->i_dentry,
|
|
- d_alias) {
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 1)
|
|
+ d_u.d_alias
|
|
+#else
|
|
+ d_alias
|
|
+#endif
|
|
+ ) {
|
|
int dcount = hgfs_d_count(dentry);
|
|
if (dcount) {
|
|
LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
|
|
@@ -1970,7 +1975,13 @@ 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,
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 1)
|
|
+ d_u.d_alias
|
|
+#else
|
|
+ d_alias
|
|
+#endif
|
|
+ );
|
|
dcount = hgfs_d_count(dentry);
|
|
if (dcount) {
|
|
LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
|