Error processing app-emulation/vmware-workstation-12.5.6.5528349, continuing...mhiretskiy 1315
parent
5a027484da
commit
89e8fc615a
@ -1,43 +0,0 @@
|
|||||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
|
||||||
--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300
|
|
||||||
@@ -32,7 +32,11 @@
|
|
||||||
#include "block.h"
|
|
||||||
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
+#else
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct dentry_operations LinkDentryOps = {
|
|
||||||
.d_revalidate = DentryOpRevalidate,
|
|
||||||
@@ -58,9 +62,12 @@
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
-static int
|
|
||||||
-DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating
|
|
||||||
- struct nameidata *nd) // IN: lookup flags & intent
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
|
|
||||||
+#else
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
struct nameidata actualNd;
|
|
||||||
@@ -101,7 +108,11 @@
|
|
||||||
if (actualDentry &&
|
|
||||||
actualDentry->d_op &&
|
|
||||||
actualDentry->d_op->d_revalidate) {
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
|
||||||
+ return actualDentry->d_op->d_revalidate(actualDentry, flags);
|
|
||||||
+#else
|
|
||||||
return actualDentry->d_op->d_revalidate(actualDentry, nd);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
|
|
@ -1,94 +0,0 @@
|
|||||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
|
||||||
Properly initializes UID/GID with repsect to namespaces
|
|
||||||
Some changes the readlink/setlink APIs
|
|
||||||
--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300
|
|
||||||
@@ -35,9 +35,15 @@
|
|
||||||
|
|
||||||
|
|
||||||
/* Inode operations */
|
|
||||||
-static struct dentry *InodeOpLookup(struct inode *dir,
|
|
||||||
- struct dentry *dentry, struct nameidata *nd);
|
|
||||||
+
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
|
|
||||||
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
|
|
||||||
+#else
|
|
||||||
+static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int);
|
|
||||||
+static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
#else
|
|
||||||
@@ -49,12 +55,15 @@
|
|
||||||
.lookup = InodeOpLookup,
|
|
||||||
};
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
|
|
||||||
static struct inode_operations LinkInodeOps = {
|
|
||||||
+#else
|
|
||||||
+struct inode_operations LinkInodeOps = {
|
|
||||||
+#endif
|
|
||||||
.readlink = InodeOpReadlink,
|
|
||||||
.follow_link = InodeOpFollowlink,
|
|
||||||
};
|
|
||||||
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
@@ -75,7 +84,11 @@
|
|
||||||
static struct dentry *
|
|
||||||
InodeOpLookup(struct inode *dir, // IN: parent directory's inode
|
|
||||||
struct dentry *dentry, // IN: dentry to lookup
|
|
||||||
- struct nameidata *nd) // IN: lookup intent and information
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+ struct nameidata *nd) // IN: lookup intent and information
|
|
||||||
+#else
|
|
||||||
+ unsigned int flags)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
char *filename;
|
|
||||||
struct inode *inode;
|
|
||||||
@@ -135,7 +148,12 @@
|
|
||||||
inode->i_size = INODE_TO_IINFO(inode)->nameLen;
|
|
||||||
inode->i_version = 1;
|
|
||||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
inode->i_uid = inode->i_gid = 0;
|
|
||||||
+#else
|
|
||||||
+ inode->i_gid = make_kgid(current_user_ns(), 0);
|
|
||||||
+ inode->i_uid = make_kuid(current_user_ns(), 0);
|
|
||||||
+#endif
|
|
||||||
inode->i_op = &LinkInodeOps;
|
|
||||||
|
|
||||||
d_add(dentry, inode);
|
|
||||||
@@ -177,7 +195,12 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
|
||||||
+ return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#else
|
|
||||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -221,7 +244,7 @@
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
- ret = vfs_follow_link(nd, iinfo->name);
|
|
||||||
+ nd_set_link(nd, iinfo->name);
|
|
||||||
|
|
||||||
out:
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
@@ -230,3 +253,4 @@
|
|
||||||
return ret;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
+
|
|
@ -1,57 +0,0 @@
|
|||||||
The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
|
|
||||||
Using new __getname/__putname API
|
|
||||||
--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
|
|
||||||
@@ -208,9 +208,11 @@
|
|
||||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
|
||||||
|
|
||||||
/* Create /proc/fs/vmblock/dev */
|
|
||||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
|
||||||
- VMBLOCK_CONTROL_MODE,
|
|
||||||
- controlProcDirEntry);
|
|
||||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
|
|
||||||
+ VMBLOCK_CONTROL_MODE,
|
|
||||||
+ controlProcDirEntry,
|
|
||||||
+ &ControlFileOps);
|
|
||||||
+
|
|
||||||
if (!controlProcEntry) {
|
|
||||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
|
||||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
|
||||||
@@ -218,7 +220,10 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
controlProcEntry->proc_fops = &ControlFileOps;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf,
|
|
||||||
int i;
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
- name = getname(buf);
|
|
||||||
+ name = __getname();
|
|
||||||
if (IS_ERR(name)) {
|
|
||||||
return PTR_ERR(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ i = strncpy_from_user(name, buf, PATH_MAX);
|
|
||||||
+ if (i < 0 || i == PATH_MAX) {
|
|
||||||
+ __putname(name);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
|
|
||||||
name[i] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
|
|
||||||
|
|
||||||
- putname(name);
|
|
||||||
+ __putname(name);
|
|
||||||
|
|
||||||
return retval;
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
Hushes a warning
|
|
||||||
--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300
|
|
||||||
+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300
|
|
||||||
@@ -1328,7 +1328,9 @@
|
|
||||||
*-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
-__attribute__((always_inline)) static Bool
|
|
||||||
+#include <linux/compiler-gcc.h>
|
|
||||||
+
|
|
||||||
+__always_inline static Bool
|
|
||||||
LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
|
|
||||||
{
|
|
||||||
TSCDelta tscDelta;
|
|
@ -1,41 +0,0 @@
|
|||||||
replaces usage of vfs_readdir with iterate_dir. origionally found here:
|
|
||||||
https://bugs.gentoo.org/show_bug.cgi?id=508204
|
|
||||||
|
|
||||||
diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
|
|
||||||
--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400
|
|
||||||
@@ -166,11 +166,9 @@
|
|
||||||
|
|
||||||
static int
|
|
||||||
FileOpReaddir(struct file *file, // IN
|
|
||||||
- void *dirent, // IN
|
|
||||||
- filldir_t filldir) // IN
|
|
||||||
+ struct dir_context *ctx)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
- FilldirInfo info;
|
|
||||||
struct file *actualFile;
|
|
||||||
|
|
||||||
if (!file) {
|
|
||||||
@@ -184,11 +182,8 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- info.filldir = filldir;
|
|
||||||
- info.dirent = dirent;
|
|
||||||
-
|
|
||||||
actualFile->f_pos = file->f_pos;
|
|
||||||
- ret = vfs_readdir(actualFile, Filldir, &info);
|
|
||||||
+ ret = iterate_dir(actualFile, ctx);
|
|
||||||
file->f_pos = actualFile->f_pos;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
@@ -237,7 +232,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
struct file_operations RootFileOps = {
|
|
||||||
- .readdir = FileOpReaddir,
|
|
||||||
+ .iterate = FileOpReaddir,
|
|
||||||
.open = FileOpOpen,
|
|
||||||
.release = FileOpRelease,
|
|
||||||
};
|
|
@ -1,53 +0,0 @@
|
|||||||
simply remove the code for Filldir since it is no longer used with the new
|
|
||||||
iterate_dir API
|
|
||||||
|
|
||||||
diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
|
|
||||||
--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400
|
|
||||||
+++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400
|
|
||||||
@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
|
|
||||||
typedef ino_t inode_num_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-/* Specifically for our filldir_t callback */
|
|
||||||
-typedef struct FilldirInfo {
|
|
||||||
- filldir_t filldir;
|
|
||||||
- void *dirent;
|
|
||||||
-} FilldirInfo;
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-/*
|
|
||||||
- *----------------------------------------------------------------------------
|
|
||||||
- *
|
|
||||||
- * Filldir --
|
|
||||||
- *
|
|
||||||
- * Callback function for readdir that we use in place of the one provided.
|
|
||||||
- * This allows us to specify that each dentry is a symlink, but pass through
|
|
||||||
- * everything else to the original filldir function.
|
|
||||||
- *
|
|
||||||
- * Results:
|
|
||||||
- * Original filldir's return value.
|
|
||||||
- *
|
|
||||||
- * Side effects:
|
|
||||||
- * Directory information gets copied to user's buffer.
|
|
||||||
- *
|
|
||||||
- *----------------------------------------------------------------------------
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
-static int
|
|
||||||
-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir
|
|
||||||
- const char *name, // IN: Dirent name
|
|
||||||
- int namelen, // IN: len of dirent's name
|
|
||||||
- loff_t offset, // IN: Offset
|
|
||||||
- inode_num_t ino, // IN: Inode number of dirent
|
|
||||||
- unsigned int d_type) // IN: Type of file
|
|
||||||
-{
|
|
||||||
- FilldirInfo *info = buf;
|
|
||||||
-
|
|
||||||
- /* Specify DT_LNK regardless */
|
|
||||||
- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
/* File operations */
|
|
||||||
|
|
||||||
/*
|
|
@ -1,46 +0,0 @@
|
|||||||
removing the no longer existing second parameter to sk_data_ready
|
|
||||||
doesn't seem it ever served a purpose.
|
|
||||||
|
|
||||||
diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
|
|
||||||
--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
|
|
||||||
+++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
|
|
||||||
@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
|
||||||
vsk = vsock_sk(sk);
|
|
||||||
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
|
|
||||||
--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500
|
|
||||||
+++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400
|
|
||||||
@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
|
||||||
struct sockaddr_vm *dst, // IN: unused
|
|
||||||
struct sockaddr_vm *src) // IN: unused
|
|
||||||
{
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
|
|
||||||
}
|
|
||||||
|
|
||||||
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
return err;
|
|
@ -1,25 +0,0 @@
|
|||||||
Hushes some (but not all warnings) relating to redefinitions of this define
|
|
||||||
--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300
|
|
||||||
@@ -53,7 +53,9 @@
|
|
||||||
* VMware HD Audio codec
|
|
||||||
* VMware HD Audio controller
|
|
||||||
*/
|
|
||||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
|
||||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
|
||||||
+#endif
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
|
||||||
--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +0300
|
|
||||||
+++ c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300
|
|
||||||
@@ -53,7 +53,9 @@
|
|
||||||
* VMware HD Audio codec
|
|
||||||
* VMware HD Audio controller
|
|
||||||
*/
|
|
||||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
|
||||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
|
||||||
+#endif
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
|
@ -1,24 +0,0 @@
|
|||||||
A copy of this since it is no longer exported by the kernel headers
|
|
||||||
--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300
|
|
||||||
@@ -21,6 +21,20 @@
|
|
||||||
|
|
||||||
#include <linux/namei.h>
|
|
||||||
|
|
||||||
+/* Copy-n-paste from kernel's source/fs/namei.c */
|
|
||||||
+struct nameidata {
|
|
||||||
+ struct path path;
|
|
||||||
+ struct qstr last;
|
|
||||||
+ struct path root;
|
|
||||||
+ struct inode *inode; /* path.dentry.d_inode */
|
|
||||||
+ unsigned int flags;
|
|
||||||
+ unsigned seq, m_seq;
|
|
||||||
+ int last_type;
|
|
||||||
+ unsigned depth;
|
|
||||||
+ struct file *base;
|
|
||||||
+ char *saved_names[MAX_NESTED_LINKS + 1];
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
|
|
||||||
* struct. They were both replaced with a struct path.
|
|
@ -1,14 +0,0 @@
|
|||||||
There is an level of abstrxtion in the newre API as of 3.19 here
|
|
||||||
--- a/vmnet-only/driver.c 2015-02-07 03:54:17.000000000 +0300
|
|
||||||
+++ c/vmnet-only/driver.c 2015-02-24 03:58:06.043605137 +0300
|
|
||||||
@@ -1191,8 +1191,8 @@
|
|
||||||
struct inode *inode = NULL;
|
|
||||||
long err;
|
|
||||||
|
|
||||||
- if (filp && filp->f_dentry) {
|
|
||||||
- inode = filp->f_dentry->d_inode;
|
|
||||||
+ if (filp && filp->f_path.dentry) {
|
|
||||||
+ inode = filp->f_path.dentry->d_inode;
|
|
||||||
}
|
|
||||||
err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
|
|
||||||
return err;
|
|
@ -1,67 +0,0 @@
|
|||||||
Sources:
|
|
||||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396484
|
|
||||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396482
|
|
||||||
diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
|
|
||||||
--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500
|
|
||||||
@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
|
|
||||||
unsigned int flags) // IN: lookup flags & intent
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
- struct nameidata actualNd;
|
|
||||||
+ struct path actualNd;
|
|
||||||
struct dentry *actualDentry;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
|
|
||||||
--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500
|
|
||||||
@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
struct inode *inode;
|
|
||||||
- struct nameidata actualNd;
|
|
||||||
+ struct path actualNd;
|
|
||||||
|
|
||||||
ASSERT(sb);
|
|
||||||
|
|
||||||
diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
|
|
||||||
--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500
|
|
||||||
+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500
|
|
||||||
@@ -26,21 +26,21 @@
|
|
||||||
* struct. They were both replaced with a struct path.
|
|
||||||
*/
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
|
||||||
-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
|
|
||||||
+#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
|
||||||
#else
|
|
||||||
#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
|
||||||
-#define compat_path_release(nd) path_put(&(nd)->path)
|
|
||||||
+#define compat_path_release(nd) path_put(nd)
|
|
||||||
#else
|
|
||||||
#define compat_path_release(nd) path_release(nd)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* path_lookup was removed in 2.6.39 merge window VFS merge */
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
||||||
-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
|
|
||||||
+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
|
|
||||||
#else
|
|
||||||
#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
|
|
||||||
#endif
|
|
||||||
diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
|
|
||||||
--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
* and that would try to acquire the inode's semaphore; if the two inodes
|
|
||||||
* are the same we'll deadlock.
|
|
||||||
*/
|
|
||||||
- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
|
|
||||||
+ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
|
|
||||||
Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
|
|
||||||
if (filp_close(actualFile, current->files) < 0) {
|
|
||||||
Warning("FileOpOpen: unable to close opened file.\n");
|
|
@ -1,20 +0,0 @@
|
|||||||
using new iterator based API, this matches exactly the changes made upstream as of vmware-modules-304.2
|
|
||||||
--- a/vmnet-only/userif.c 2015-02-07 03:54:17.000000000 +0300
|
|
||||||
+++ c/vmnet-only/userif.c 2015-02-24 03:58:06.043605137 +0300
|
|
||||||
@@ -523,7 +523,15 @@
|
|
||||||
.iov_base = buf,
|
|
||||||
.iov_len = len,
|
|
||||||
};
|
|
||||||
- return skb_copy_datagram_iovec(skb, 0, &iov, len);
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
|
|
||||||
+ return skb_copy_datagram_iovec(skb, 0, &iov, len);
|
|
||||||
+#else
|
|
||||||
+ struct iov_iter to;
|
|
||||||
+ iov_iter_init(&to, READ, &iov, 1, len);
|
|
||||||
+ return skb_copy_datagram_iter(skb, 0, &to, len);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300
|
|
||||||
@@ -40,6 +40,7 @@
|
|
||||||
#include <linux/socket.h> /* For memcpy_{to,from}iovec(). */
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
+#include <linux/skbuff.h>
|
|
||||||
|
|
||||||
#include "compat_highmem.h"
|
|
||||||
#include "compat_interrupt.h"
|
|
||||||
@@ -1196,21 +1197,21 @@
|
|
||||||
} else {
|
|
||||||
toCopy = size - bytesCopied;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */
|
|
||||||
if (isIovec) {
|
|
||||||
- struct iovec *iov = (struct iovec *)src;
|
|
||||||
- int err;
|
|
||||||
+ struct msghdr *msg = (struct msghdr *)src;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
- /* The iovec will track bytesCopied internally. */
|
|
||||||
- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
|
|
||||||
- if (err != 0) {
|
|
||||||
- if (kernelIf->host) {
|
|
||||||
- kunmap(kernelIf->u.h.page[pageIndex]);
|
|
||||||
+ /* The iovec will track bytes_copied internally. */
|
|
||||||
+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ if (kernelIf->host)
|
|
||||||
+ kunmap(kernelIf->u.h.page[pageIndex]);
|
|
||||||
+ return VMCI_ERROR_INVALID_ARGS;
|
|
||||||
}
|
|
||||||
- return VMCI_ERROR_INVALID_ARGS;
|
|
||||||
- }
|
|
||||||
- } else {
|
|
||||||
- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy);
|
|
||||||
+ } else {
|
|
||||||
+ memcpy((u8 *)va + pageOffset,
|
|
||||||
+ (u8 *)src + bytesCopied, toCopy);
|
|
||||||
}
|
|
||||||
|
|
||||||
bytesCopied += toCopy;
|
|
||||||
@@ -1273,11 +1274,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isIovec) {
|
|
||||||
- struct iovec *iov = (struct iovec *)dest;
|
|
||||||
+ struct msghdr *msg = (struct msghdr *)dest;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
/* The iovec will track bytesCopied internally. */
|
|
||||||
- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
|
|
||||||
+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
|
|
||||||
if (err != 0) {
|
|
||||||
if (kernelIf->host) {
|
|
||||||
kunmap(kernelIf->u.h.page[pageIndex]);
|
|
@ -1,25 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
|
|
||||||
--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
|
|
||||||
+++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
|
|
||||||
@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
|
|
||||||
* able to send.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
|
|
||||||
+ written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
|
|
||||||
len - totalWritten, 0);
|
|
||||||
if (written < 0) {
|
|
||||||
err = -ENOMEM;
|
|
||||||
@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flags & MSG_PEEK) {
|
|
||||||
- read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
|
|
||||||
+ read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
|
||||||
} else {
|
|
||||||
- read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
|
|
||||||
+ read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (read < 0) {
|
|
@ -1,16 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400
|
|
||||||
@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Place the datagram payload in the user's iovec. */
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
|
|
||||||
err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
|
|
||||||
+#else
|
|
||||||
+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
|
|
||||||
+#endif
|
|
||||||
if (err) {
|
|
||||||
goto out;
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400
|
|
||||||
@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
|
|
||||||
+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
|
|
||||||
|
|
||||||
dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
|
|
||||||
dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
|
|
@ -1,45 +0,0 @@
|
|||||||
diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
|
|
||||||
--- vmblock-only/linux/inode.c 2016-03-16 21:24:25.771034759 -0400
|
|
||||||
+++ vmblock-only.new/linux/inode.c 2016-03-16 21:26:22.697036311 -0400
|
|
||||||
@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
|
|
||||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
#else
|
|
||||||
static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
@@ -220,7 +222,9 @@ InodeOpReadlink(struct dentry *dentry,
|
|
||||||
*
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
-
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
|
|
||||||
+#else
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *
|
|
||||||
#else
|
|
||||||
@@ -228,6 +232,7 @@ static int
|
|
||||||
#endif
|
|
||||||
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
|
|
||||||
struct nameidata *nd) // OUT: stores result
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
@@ -244,7 +249,11 @@ InodeOpFollowlink(struct dentry *dentry,
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+ return *cookie = (char *)(iinfo->name);
|
|
||||||
+#else
|
|
||||||
nd_set_link(nd, iinfo->name);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
out:
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
@ -1,13 +0,0 @@
|
|||||||
diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
|
|
||||||
--- vmci-only/linux/driver.c 2015-11-03 19:27:55.000000000 -0500
|
|
||||||
+++ vmci-only.new/linux/driver.c 2016-03-16 21:30:47.646039829 -0400
|
|
||||||
@@ -26,6 +26,9 @@
|
|
||||||
|
|
||||||
#include <linux/file.h>
|
|
||||||
#include <linux/fs.h>
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+#include <linux/vmalloc.h>
|
|
||||||
+#endif
|
|
||||||
#include <linux/init.h>
|
|
||||||
#if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
|
|
||||||
# include <linux/ioctl32.h>
|
|
@ -1,77 +0,0 @@
|
|||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2016-03-16 21:31:24.582040320 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2016-03-16 21:37:22.140045067 -0400
|
|
||||||
@@ -231,7 +231,16 @@ static int VSockVmciStreamSetsockopt(str
|
|
||||||
|
|
||||||
static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
|
|
||||||
char __user *optval, int __user * optlen);
|
|
||||||
-
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+static int VSockVmciDgramSendmsg(
|
|
||||||
+ struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
+static int VSockVmciDgramRecvmsg(struct socket *sock,
|
|
||||||
+ struct msghdr *msg, size_t len, int flags);
|
|
||||||
+static int VSockVmciStreamSendmsg(
|
|
||||||
+ struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
+static int VSockVmciStreamRecvmsg(struct socket *sock,
|
|
||||||
+ struct msghdr *msg, size_t len, int flags);
|
|
||||||
+#else
|
|
||||||
static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
|
|
||||||
struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
|
||||||
@@ -240,6 +249,7 @@ static int VSockVmciStreamSendmsg(struct
|
|
||||||
struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
|
||||||
struct msghdr *msg, size_t len, int flags);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static int VSockVmciCreate(
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
|
|
||||||
@@ -4210,7 +4220,11 @@ VSockVmciShutdown(struct socket *sock,
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+VSockVmciDgramSendmsg(
|
|
||||||
+#else
|
|
||||||
VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
+#endif
|
|
||||||
struct socket *sock, // IN: socket to send on
|
|
||||||
struct msghdr *msg, // IN: message to send
|
|
||||||
size_t len) // IN: length of message
|
|
||||||
@@ -4540,7 +4554,11 @@ VSockVmciStreamGetsockopt(struct socket
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+VSockVmciStreamSendmsg(
|
|
||||||
+#else
|
|
||||||
VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
+#endif
|
|
||||||
struct socket *sock, // IN: socket to send on
|
|
||||||
struct msghdr *msg, // IN: message to send
|
|
||||||
size_t len) // IN: length of message
|
|
||||||
@@ -4709,7 +4727,11 @@ out:
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+VSockVmciDgramRecvmsg(
|
|
||||||
+#else
|
|
||||||
VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
+#endif
|
|
||||||
struct socket *sock, // IN: socket to receive from
|
|
||||||
struct msghdr *msg, // IN/OUT: message to receive into
|
|
||||||
size_t len, // IN: length of receive buffer
|
|
||||||
@@ -4804,7 +4826,11 @@ out:
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+VSockVmciStreamRecvmsg(
|
|
||||||
+#else
|
|
||||||
VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
+#endif
|
|
||||||
struct socket *sock, // IN: socket to receive from
|
|
||||||
struct msghdr *msg, // IN/OUT: message to receive into
|
|
||||||
size_t len, // IN: length of receive buffer
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2016-03-16 21:38:01.401045589 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2016-03-16 21:39:32.529046799 -0400
|
|
||||||
@@ -2836,7 +2836,9 @@ __VSockVmciCreate(struct net *net,
|
|
||||||
* network namespace, and the option to zero the sock was dropped.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
|
|
||||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
|
|
||||||
sk = sk_alloc(vsockVmciFamilyOps.family, priority,
|
|
||||||
vsockVmciProto.slab_obj_size, vsockVmciProto.slab);
|
|
||||||
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
|
|
@ -1,34 +0,0 @@
|
|||||||
diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
|
|
||||||
--- vmci-only/linux/driver.c 2016-03-16 21:59:30.229062702 -0400
|
|
||||||
+++ vmci-only.new/linux/driver.c 2016-03-16 21:58:35.452061974 -0400
|
|
||||||
@@ -2469,7 +2469,9 @@ vmci_init(void)
|
|
||||||
static void __exit
|
|
||||||
vmci_exit(void)
|
|
||||||
{
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
|
|
||||||
int retval;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (guestDeviceInit) {
|
|
||||||
pci_unregister_driver(&vmci_driver);
|
|
||||||
|
|
||||||
diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
|
|
||||||
--- vmci-only/linux/driver.c 2016-03-16 21:53:24.184057841 -0400
|
|
||||||
+++ vmci-only.new/linux/driver.c 2016-03-16 21:54:37.558058816 -0400
|
|
||||||
@@ -2482,12 +2482,16 @@ vmci_exit(void)
|
|
||||||
|
|
||||||
VMCI_HostCleanup();
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+ misc_deregister(&linuxState.misc);
|
|
||||||
+#else
|
|
||||||
retval = misc_deregister(&linuxState.misc);
|
|
||||||
if (retval) {
|
|
||||||
Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
|
|
||||||
} else {
|
|
||||||
Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
hostDeviceInit = FALSE;
|
|
||||||
}
|
|
@ -1,67 +0,0 @@
|
|||||||
diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
|
|
||||||
--- vmblock-only/linux/inode.c 2016-03-16 22:22:00.470080630 -0400
|
|
||||||
+++ vmblock-only.new/linux/inode.c 2016-03-16 22:23:33.016081859 -0400
|
|
||||||
@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
|
|
||||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
|
||||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
@@ -63,7 +65,11 @@ static struct inode_operations LinkInode
|
|
||||||
struct inode_operations LinkInodeOps = {
|
|
||||||
#endif
|
|
||||||
.readlink = InodeOpReadlink,
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+ .get_link = InodeOpGetLink,
|
|
||||||
+#else
|
|
||||||
.follow_link = InodeOpFollowlink,
|
|
||||||
+#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -222,7 +228,9 @@ InodeOpReadlink(struct dentry *dentry,
|
|
||||||
*
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done)
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
|
|
||||||
#else
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
@@ -238,18 +246,28 @@ InodeOpFollowlink(struct dentry *dentry,
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
|
|
||||||
if (!dentry) {
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+ ret = -ECHILD;
|
|
||||||
+#else
|
|
||||||
Warning("InodeOpReadlink: invalid args from kernel\n");
|
|
||||||
ret = -EINVAL;
|
|
||||||
+#endif
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+ iinfo = INODE_TO_IINFO(inode);
|
|
||||||
+#else
|
|
||||||
iinfo = INODE_TO_IINFO(dentry->d_inode);
|
|
||||||
+#endif
|
|
||||||
if (!iinfo) {
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
|
||||||
+ return (char *)(iinfo->name);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
|
|
||||||
return *cookie = (char *)(iinfo->name);
|
|
||||||
#else
|
|
||||||
nd_set_link(nd, iinfo->name);
|
|
@ -1,84 +0,0 @@
|
|||||||
--- ./vmci-only/linux/driver.c.old 2016-05-19 19:00:09.784669042 +0200
|
|
||||||
+++ ./vmci-only/linux/driver.c 2016-05-19 19:00:47.480671150 +0200
|
|
||||||
@@ -1468,7 +1468,11 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages(addr,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
||||||
+#endif
|
|
||||||
1, 1, 0, &page, NULL);
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
||||||
--- ./vmci-only/linux/vmciKernelIf.c.old 2016-05-19 18:57:04.344658673 +0200
|
|
||||||
+++ ./vmci-only/linux/vmciKernelIf.c 2016-05-19 19:03:28.600680159 +0200
|
|
||||||
@@ -1835,7 +1835,11 @@
|
|
||||||
if (dirty) {
|
|
||||||
set_page_dirty(pages[i]);
|
|
||||||
}
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ put_page(pages[i]);
|
|
||||||
+#else
|
|
||||||
page_cache_release(pages[i]);
|
|
||||||
+#endif
|
|
||||||
pages[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2049,9 +2053,13 @@
|
|
||||||
int err = VMCI_SUCCESS;
|
|
||||||
|
|
||||||
down_write(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages((VA)produceUVA,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current,
|
|
||||||
current->mm,
|
|
||||||
(VA)produceUVA,
|
|
||||||
+#endif
|
|
||||||
produceQ->kernelIf->numPages,
|
|
||||||
1, 0,
|
|
||||||
produceQ->kernelIf->u.h.headerPage,
|
|
||||||
@@ -2063,9 +2071,13 @@
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages((VA)consumeUVA,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current,
|
|
||||||
current->mm,
|
|
||||||
(VA)consumeUVA,
|
|
||||||
+#endif
|
|
||||||
consumeQ->kernelIf->numPages,
|
|
||||||
1, 0,
|
|
||||||
consumeQ->kernelIf->u.h.headerPage,
|
|
||||||
--- ./vmmon-only/linux/hostif.c.old 2016-05-19 18:50:42.872637343 +0200
|
|
||||||
+++ ./vmmon-only/linux/hostif.c 2016-05-19 18:53:40.208647259 +0200
|
|
||||||
@@ -1163,7 +1163,11 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages((unsigned long)uvAddr,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
|
|
||||||
+#endif
|
|
||||||
numPages, 0, 0, ppages, NULL);
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
||||||
--- ./vmnet-only/userif.c.old 2016-05-19 18:52:45.904644222 +0200
|
|
||||||
+++ ./vmnet-only/userif.c 2016-05-19 18:53:28.599646610 +0200
|
|
||||||
@@ -113,7 +113,11 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages(addr,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
||||||
+#endif
|
|
||||||
1, 1, 0, &page, NULL);
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
|
|
||||||
+++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
|
|
||||||
@@ -465,7 +465,7 @@
|
|
||||||
VNetSend(&netIf->port.jack, skb);
|
|
||||||
|
|
||||||
netIf->stats.tx_packets++;
|
|
||||||
- dev->trans_start = jiffies;
|
|
||||||
+ netif_trans_update(dev);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200
|
|
||||||
+++ vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200
|
|
||||||
@@ -205,10 +205,11 @@
|
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
|
||||||
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
|
|
||||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
#else
|
|
||||||
- return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
+ return generic_readlink(dentry, buffer, buflen);
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
|
||||||
--- a/vmmon-only/linux/hostif.c 2016-08-13 16:54:18.935207507 +0300
|
|
||||||
+++ b/vmmon-only/linux/hostif.c 2016-08-13 16:53:52.981424256 +0300
|
|
||||||
@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
|
|
||||||
*/
|
|
||||||
#define LOCKED_PAGE_SLACK 10000
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
|
|
||||||
+#define NR_ANON_PAGES NR_ANON_MAPPED
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static struct {
|
|
||||||
Atomic_uint64 uptimeBase;
|
|
||||||
VersionedAtomic version;
|
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
|
||||||
index f1f4b10..c43242f 100644
|
|
||||||
--- a/vmmon-only/linux/hostif.c
|
|
||||||
+++ b/vmmon-only/linux/hostif.c
|
|
||||||
@@ -55,6 +55,7 @@
|
|
||||||
#include <linux/kthread.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
|
|
||||||
+#include <asm/apic.h>
|
|
||||||
|
|
||||||
#include "vmware.h"
|
|
||||||
#include "x86apic.h"
|
|
@ -1,107 +0,0 @@
|
|||||||
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
|
|
||||||
index b21dd44..960c2aa 100644
|
|
||||||
--- a/vmmon-only/linux/driver.c
|
|
||||||
+++ b/vmmon-only/linux/driver.c
|
|
||||||
@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
-static struct file_operations vmuser_fops;
|
|
||||||
+static struct file_operations vmuser_fops = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .poll = LinuxDriverPoll,
|
|
||||||
+#ifdef HAVE_UNLOCKED_IOCTL
|
|
||||||
+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
|
|
||||||
+#else
|
|
||||||
+ .ioctl = LinuxDriver_Ioctl,
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_COMPAT_IOCTL
|
|
||||||
+ .compat_ioctl = LinuxDriver_UnlockedIoctl,
|
|
||||||
+#endif
|
|
||||||
+ .open = LinuxDriver_Open,
|
|
||||||
+ .release = LinuxDriver_Close,
|
|
||||||
+ .mmap = LinuxDriverMmap
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static struct timer_list tscTimer;
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -357,27 +372,6 @@ init_module(void)
|
|
||||||
spin_lock_init(&linuxState.pollListLock);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Initialize the file_operations structure. Because this code is always
|
|
||||||
- * compiled as a module, this is fine to do it here and not in a static
|
|
||||||
- * initializer.
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
|
|
||||||
- vmuser_fops.owner = THIS_MODULE;
|
|
||||||
- vmuser_fops.poll = LinuxDriverPoll;
|
|
||||||
-#ifdef HAVE_UNLOCKED_IOCTL
|
|
||||||
- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
|
|
||||||
-#else
|
|
||||||
- vmuser_fops.ioctl = LinuxDriver_Ioctl;
|
|
||||||
-#endif
|
|
||||||
-#ifdef HAVE_COMPAT_IOCTL
|
|
||||||
- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
|
|
||||||
-#endif
|
|
||||||
- vmuser_fops.open = LinuxDriver_Open;
|
|
||||||
- vmuser_fops.release = LinuxDriver_Close;
|
|
||||||
- vmuser_fops.mmap = LinuxDriverMmap;
|
|
||||||
-
|
|
||||||
#ifdef VMX86_DEVEL
|
|
||||||
devel_init_module();
|
|
||||||
linuxState.minor = 0;
|
|
||||||
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
|
|
||||||
index b12b982..40bd4cf 100644
|
|
||||||
--- a/vmnet-only/driver.c
|
|
||||||
+++ b/vmnet-only/driver.c
|
|
||||||
@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
|
|
||||||
unsigned int iocmd, unsigned long ioarg);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static struct file_operations vnetFileOps;
|
|
||||||
+static struct file_operations vnetFileOps = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .read = VNetFileOpRead,
|
|
||||||
+ .write = VNetFileOpWrite,
|
|
||||||
+ .poll = VNetFileOpPoll,
|
|
||||||
+#ifdef HAVE_UNLOCKED_IOCTL
|
|
||||||
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
|
|
||||||
+#else
|
|
||||||
+ .ioctl = VNetFileOpIoctl,
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_COMPAT_IOCTL
|
|
||||||
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
|
|
||||||
+#endif
|
|
||||||
+ .open = VNetFileOpOpen,
|
|
||||||
+ .release = VNetFileOpClose
|
|
||||||
+};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Utility functions
|
|
||||||
@@ -476,22 +491,6 @@ init_module(void)
|
|
||||||
goto err_proto;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Initialize the file_operations structure. Because this code is always
|
|
||||||
- * compiled as a module, this is fine to do it here and not in a static
|
|
||||||
- * initializer.
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
- memset(&vnetFileOps, 0, sizeof vnetFileOps);
|
|
||||||
- vnetFileOps.owner = THIS_MODULE;
|
|
||||||
- vnetFileOps.read = VNetFileOpRead;
|
|
||||||
- vnetFileOps.write = VNetFileOpWrite;
|
|
||||||
- vnetFileOps.poll = VNetFileOpPoll;
|
|
||||||
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
|
|
||||||
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
|
|
||||||
- vnetFileOps.open = VNetFileOpOpen;
|
|
||||||
- vnetFileOps.release = VNetFileOpClose;
|
|
||||||
-
|
|
||||||
retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
|
|
||||||
if (retval) {
|
|
||||||
LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
|
|
@ -1,65 +0,0 @@
|
|||||||
diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
|
|
||||||
index ab7a727..e3ec9d2 100644
|
|
||||||
--- a/vmblock-only/Makefile.kernel
|
|
||||||
+++ b/vmblock-only/Makefile.kernel
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
INCLUDE += -I$(SRCROOT)/include
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
|
|
||||||
diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
|
|
||||||
index ba343ee..861ea83 100644
|
|
||||||
--- a/vmci-only/Makefile.kernel
|
|
||||||
+++ b/vmci-only/Makefile.kernel
|
|
||||||
@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
|
|
||||||
|
|
||||||
INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
obj-m += $(DRIVER).o
|
|
||||||
|
|
||||||
diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
|
|
||||||
index 8770d1d..c4746c3 100644
|
|
||||||
--- a/vmmon-only/Makefile.kernel
|
|
||||||
+++ b/vmmon-only/Makefile.kernel
|
|
||||||
@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
|
|
||||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
|
|
||||||
-I$(SRCROOT)/vmcore
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
|
|
||||||
|
|
||||||
diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
|
|
||||||
index d1e3133..665d428 100644
|
|
||||||
--- a/vmnet-only/Makefile.kernel
|
|
||||||
+++ b/vmnet-only/Makefile.kernel
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
INCLUDE := -I$(SRCROOT)
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
|
|
||||||
diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
|
|
||||||
index b4629ee..264b8cb 100644
|
|
||||||
--- a/vsock-only/Makefile.kernel
|
|
||||||
+++ b/vsock-only/Makefile.kernel
|
|
||||||
@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
|
|
||||||
INCLUDE += -I$(SRCROOT)/linux
|
|
||||||
INCLUDE += -I$(SRCROOT)/common
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
|||||||
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
|
|
||||||
index 2b81323..746c8b8 100644
|
|
||||||
--- a/vmblock-only/Makefile
|
|
||||||
+++ b/vmblock-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmblock
|
|
||||||
PRODUCT := ws
|
|
||||||
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
|
|
||||||
index 8e9c5be..6ec828b 100644
|
|
||||||
--- a/vmci-only/Makefile
|
|
||||||
+++ b/vmci-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmci
|
|
||||||
PRODUCT := ws
|
|
||||||
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
|
|
||||||
index 5bd867b..91a83d4 100644
|
|
||||||
--- a/vmmon-only/Makefile
|
|
||||||
+++ b/vmmon-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmmon
|
|
||||||
PRODUCT := @@PRODUCT@@
|
|
||||||
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
|
|
||||||
index d4eb73c..c7c6d38 100644
|
|
||||||
--- a/vmnet-only/Makefile
|
|
||||||
+++ b/vmnet-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmnet
|
|
||||||
PRODUCT := @@PRODUCT@@
|
|
||||||
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
|
|
||||||
index 93dd61d..9765696 100644
|
|
||||||
--- a/vsock-only/Makefile
|
|
||||||
+++ b/vsock-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vsock
|
|
||||||
PRODUCT := ws
|
|
@ -1,24 +0,0 @@
|
|||||||
diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
|
|
||||||
index 7a56304..9ff4548 100644
|
|
||||||
--- a/vmnet-only/compat_netdevice.h
|
|
||||||
+++ b/vmnet-only/compat_netdevice.h
|
|
||||||
@@ -47,6 +47,19 @@
|
|
||||||
# define net_device device
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* it looks like these have been removed from the kernel 3.1
|
|
||||||
+ * probably because the "transition" is considered complete.
|
|
||||||
+ * so to keep this source compatible we just redefine them like they were
|
|
||||||
+ * previously
|
|
||||||
+ */
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
|
|
||||||
+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
|
|
||||||
+ functions are available. */
|
|
||||||
+#define HAVE_FREE_NETDEV /* free_netdev() */
|
|
||||||
+#define HAVE_NETDEV_PRIV /* netdev_priv() */
|
|
||||||
+#define HAVE_NETIF_QUEUE
|
|
||||||
+#define HAVE_NET_DEVICE_OPS
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
|
|
@ -1,43 +0,0 @@
|
|||||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
|
||||||
--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300
|
|
||||||
@@ -32,7 +32,11 @@
|
|
||||||
#include "block.h"
|
|
||||||
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
+#else
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct dentry_operations LinkDentryOps = {
|
|
||||||
.d_revalidate = DentryOpRevalidate,
|
|
||||||
@@ -58,9 +62,12 @@
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
-static int
|
|
||||||
-DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating
|
|
||||||
- struct nameidata *nd) // IN: lookup flags & intent
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
|
|
||||||
+#else
|
|
||||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
struct nameidata actualNd;
|
|
||||||
@@ -101,7 +108,11 @@
|
|
||||||
if (actualDentry &&
|
|
||||||
actualDentry->d_op &&
|
|
||||||
actualDentry->d_op->d_revalidate) {
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
|
||||||
+ return actualDentry->d_op->d_revalidate(actualDentry, flags);
|
|
||||||
+#else
|
|
||||||
return actualDentry->d_op->d_revalidate(actualDentry, nd);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
|
|
@ -1,94 +0,0 @@
|
|||||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
|
||||||
Properly initializes UID/GID with repsect to namespaces
|
|
||||||
Some changes the readlink/setlink APIs
|
|
||||||
--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300
|
|
||||||
@@ -35,9 +35,15 @@
|
|
||||||
|
|
||||||
|
|
||||||
/* Inode operations */
|
|
||||||
-static struct dentry *InodeOpLookup(struct inode *dir,
|
|
||||||
- struct dentry *dentry, struct nameidata *nd);
|
|
||||||
+
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
|
|
||||||
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
|
|
||||||
+#else
|
|
||||||
+static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int);
|
|
||||||
+static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
#else
|
|
||||||
@@ -49,12 +55,15 @@
|
|
||||||
.lookup = InodeOpLookup,
|
|
||||||
};
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
|
|
||||||
static struct inode_operations LinkInodeOps = {
|
|
||||||
+#else
|
|
||||||
+struct inode_operations LinkInodeOps = {
|
|
||||||
+#endif
|
|
||||||
.readlink = InodeOpReadlink,
|
|
||||||
.follow_link = InodeOpFollowlink,
|
|
||||||
};
|
|
||||||
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
@@ -75,7 +84,11 @@
|
|
||||||
static struct dentry *
|
|
||||||
InodeOpLookup(struct inode *dir, // IN: parent directory's inode
|
|
||||||
struct dentry *dentry, // IN: dentry to lookup
|
|
||||||
- struct nameidata *nd) // IN: lookup intent and information
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
+ struct nameidata *nd) // IN: lookup intent and information
|
|
||||||
+#else
|
|
||||||
+ unsigned int flags)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
char *filename;
|
|
||||||
struct inode *inode;
|
|
||||||
@@ -135,7 +148,12 @@
|
|
||||||
inode->i_size = INODE_TO_IINFO(inode)->nameLen;
|
|
||||||
inode->i_version = 1;
|
|
||||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
inode->i_uid = inode->i_gid = 0;
|
|
||||||
+#else
|
|
||||||
+ inode->i_gid = make_kgid(current_user_ns(), 0);
|
|
||||||
+ inode->i_uid = make_kuid(current_user_ns(), 0);
|
|
||||||
+#endif
|
|
||||||
inode->i_op = &LinkInodeOps;
|
|
||||||
|
|
||||||
d_add(dentry, inode);
|
|
||||||
@@ -177,7 +195,12 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
|
||||||
+ return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#else
|
|
||||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -221,7 +244,7 @@
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
- ret = vfs_follow_link(nd, iinfo->name);
|
|
||||||
+ nd_set_link(nd, iinfo->name);
|
|
||||||
|
|
||||||
out:
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
@@ -230,3 +253,4 @@
|
|
||||||
return ret;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
+
|
|
@ -1,57 +0,0 @@
|
|||||||
The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
|
|
||||||
Using new __getname/__putname API
|
|
||||||
--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
|
|
||||||
@@ -208,9 +208,11 @@
|
|
||||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
|
||||||
|
|
||||||
/* Create /proc/fs/vmblock/dev */
|
|
||||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
|
||||||
- VMBLOCK_CONTROL_MODE,
|
|
||||||
- controlProcDirEntry);
|
|
||||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
|
|
||||||
+ VMBLOCK_CONTROL_MODE,
|
|
||||||
+ controlProcDirEntry,
|
|
||||||
+ &ControlFileOps);
|
|
||||||
+
|
|
||||||
if (!controlProcEntry) {
|
|
||||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
|
||||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
|
||||||
@@ -218,7 +220,10 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
|
||||||
controlProcEntry->proc_fops = &ControlFileOps;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf,
|
|
||||||
int i;
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
- name = getname(buf);
|
|
||||||
+ name = __getname();
|
|
||||||
if (IS_ERR(name)) {
|
|
||||||
return PTR_ERR(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ i = strncpy_from_user(name, buf, PATH_MAX);
|
|
||||||
+ if (i < 0 || i == PATH_MAX) {
|
|
||||||
+ __putname(name);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
|
|
||||||
name[i] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
|
|
||||||
|
|
||||||
- putname(name);
|
|
||||||
+ __putname(name);
|
|
||||||
|
|
||||||
return retval;
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
Hushes a warning
|
|
||||||
--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300
|
|
||||||
+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300
|
|
||||||
@@ -1328,7 +1328,9 @@
|
|
||||||
*-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
-__attribute__((always_inline)) static Bool
|
|
||||||
+#include <linux/compiler-gcc.h>
|
|
||||||
+
|
|
||||||
+__always_inline static Bool
|
|
||||||
LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
|
|
||||||
{
|
|
||||||
TSCDelta tscDelta;
|
|
@ -1,41 +0,0 @@
|
|||||||
replaces usage of vfs_readdir with iterate_dir. origionally found here:
|
|
||||||
https://bugs.gentoo.org/show_bug.cgi?id=508204
|
|
||||||
|
|
||||||
diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
|
|
||||||
--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400
|
|
||||||
@@ -166,11 +166,9 @@
|
|
||||||
|
|
||||||
static int
|
|
||||||
FileOpReaddir(struct file *file, // IN
|
|
||||||
- void *dirent, // IN
|
|
||||||
- filldir_t filldir) // IN
|
|
||||||
+ struct dir_context *ctx)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
- FilldirInfo info;
|
|
||||||
struct file *actualFile;
|
|
||||||
|
|
||||||
if (!file) {
|
|
||||||
@@ -184,11 +182,8 @@
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- info.filldir = filldir;
|
|
||||||
- info.dirent = dirent;
|
|
||||||
-
|
|
||||||
actualFile->f_pos = file->f_pos;
|
|
||||||
- ret = vfs_readdir(actualFile, Filldir, &info);
|
|
||||||
+ ret = iterate_dir(actualFile, ctx);
|
|
||||||
file->f_pos = actualFile->f_pos;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
@@ -237,7 +232,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
struct file_operations RootFileOps = {
|
|
||||||
- .readdir = FileOpReaddir,
|
|
||||||
+ .iterate = FileOpReaddir,
|
|
||||||
.open = FileOpOpen,
|
|
||||||
.release = FileOpRelease,
|
|
||||||
};
|
|
@ -1,53 +0,0 @@
|
|||||||
simply remove the code for Filldir since it is no longer used with the new
|
|
||||||
iterate_dir API
|
|
||||||
|
|
||||||
diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
|
|
||||||
--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400
|
|
||||||
+++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400
|
|
||||||
@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
|
|
||||||
typedef ino_t inode_num_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-/* Specifically for our filldir_t callback */
|
|
||||||
-typedef struct FilldirInfo {
|
|
||||||
- filldir_t filldir;
|
|
||||||
- void *dirent;
|
|
||||||
-} FilldirInfo;
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-/*
|
|
||||||
- *----------------------------------------------------------------------------
|
|
||||||
- *
|
|
||||||
- * Filldir --
|
|
||||||
- *
|
|
||||||
- * Callback function for readdir that we use in place of the one provided.
|
|
||||||
- * This allows us to specify that each dentry is a symlink, but pass through
|
|
||||||
- * everything else to the original filldir function.
|
|
||||||
- *
|
|
||||||
- * Results:
|
|
||||||
- * Original filldir's return value.
|
|
||||||
- *
|
|
||||||
- * Side effects:
|
|
||||||
- * Directory information gets copied to user's buffer.
|
|
||||||
- *
|
|
||||||
- *----------------------------------------------------------------------------
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
-static int
|
|
||||||
-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir
|
|
||||||
- const char *name, // IN: Dirent name
|
|
||||||
- int namelen, // IN: len of dirent's name
|
|
||||||
- loff_t offset, // IN: Offset
|
|
||||||
- inode_num_t ino, // IN: Inode number of dirent
|
|
||||||
- unsigned int d_type) // IN: Type of file
|
|
||||||
-{
|
|
||||||
- FilldirInfo *info = buf;
|
|
||||||
-
|
|
||||||
- /* Specify DT_LNK regardless */
|
|
||||||
- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
/* File operations */
|
|
||||||
|
|
||||||
/*
|
|
@ -1,46 +0,0 @@
|
|||||||
removing the no longer existing second parameter to sk_data_ready
|
|
||||||
doesn't seem it ever served a purpose.
|
|
||||||
|
|
||||||
diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
|
|
||||||
--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
|
|
||||||
+++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
|
|
||||||
@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
|
||||||
vsk = vsock_sk(sk);
|
|
||||||
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
|
|
||||||
--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500
|
|
||||||
+++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400
|
|
||||||
@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
|
||||||
struct sockaddr_vm *dst, // IN: unused
|
|
||||||
struct sockaddr_vm *src) // IN: unused
|
|
||||||
{
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
|
|
||||||
}
|
|
||||||
|
|
||||||
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
|
||||||
+ sk->sk_data_ready(sk);
|
|
||||||
+#else
|
|
||||||
sk->sk_data_ready(sk, 0);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
return err;
|
|
@ -1,25 +0,0 @@
|
|||||||
Hushes some (but not all warnings) relating to redefinitions of this define
|
|
||||||
--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300
|
|
||||||
@@ -53,7 +53,9 @@
|
|
||||||
* VMware HD Audio codec
|
|
||||||
* VMware HD Audio controller
|
|
||||||
*/
|
|
||||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
|
||||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
|
||||||
+#endif
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
|
||||||
--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +0300
|
|
||||||
+++ c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300
|
|
||||||
@@ -53,7 +53,9 @@
|
|
||||||
* VMware HD Audio codec
|
|
||||||
* VMware HD Audio controller
|
|
||||||
*/
|
|
||||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
|
||||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
|
||||||
+#endif
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
|
||||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
|
@ -1,24 +0,0 @@
|
|||||||
A copy of this since it is no longer exported by the kernel headers
|
|
||||||
--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300
|
|
||||||
@@ -21,6 +21,20 @@
|
|
||||||
|
|
||||||
#include <linux/namei.h>
|
|
||||||
|
|
||||||
+/* Copy-n-paste from kernel's source/fs/namei.c */
|
|
||||||
+struct nameidata {
|
|
||||||
+ struct path path;
|
|
||||||
+ struct qstr last;
|
|
||||||
+ struct path root;
|
|
||||||
+ struct inode *inode; /* path.dentry.d_inode */
|
|
||||||
+ unsigned int flags;
|
|
||||||
+ unsigned seq, m_seq;
|
|
||||||
+ int last_type;
|
|
||||||
+ unsigned depth;
|
|
||||||
+ struct file *base;
|
|
||||||
+ char *saved_names[MAX_NESTED_LINKS + 1];
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
|
|
||||||
* struct. They were both replaced with a struct path.
|
|
@ -1,67 +0,0 @@
|
|||||||
Sources:
|
|
||||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396484
|
|
||||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396482
|
|
||||||
diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
|
|
||||||
--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500
|
|
||||||
@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
|
|
||||||
unsigned int flags) // IN: lookup flags & intent
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
- struct nameidata actualNd;
|
|
||||||
+ struct path actualNd;
|
|
||||||
struct dentry *actualDentry;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
|
|
||||||
--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500
|
|
||||||
@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f
|
|
||||||
{
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
struct inode *inode;
|
|
||||||
- struct nameidata actualNd;
|
|
||||||
+ struct path actualNd;
|
|
||||||
|
|
||||||
ASSERT(sb);
|
|
||||||
|
|
||||||
diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
|
|
||||||
--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500
|
|
||||||
+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500
|
|
||||||
@@ -26,21 +26,21 @@
|
|
||||||
* struct. They were both replaced with a struct path.
|
|
||||||
*/
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
|
||||||
-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
|
|
||||||
+#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
|
||||||
#else
|
|
||||||
#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
|
||||||
-#define compat_path_release(nd) path_put(&(nd)->path)
|
|
||||||
+#define compat_path_release(nd) path_put(nd)
|
|
||||||
#else
|
|
||||||
#define compat_path_release(nd) path_release(nd)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* path_lookup was removed in 2.6.39 merge window VFS merge */
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
|
||||||
-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
|
|
||||||
+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
|
|
||||||
#else
|
|
||||||
#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
|
|
||||||
#endif
|
|
||||||
diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
|
|
||||||
--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500
|
|
||||||
+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
* and that would try to acquire the inode's semaphore; if the two inodes
|
|
||||||
* are the same we'll deadlock.
|
|
||||||
*/
|
|
||||||
- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
|
|
||||||
+ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
|
|
||||||
Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
|
|
||||||
if (filp_close(actualFile, current->files) < 0) {
|
|
||||||
Warning("FileOpOpen: unable to close opened file.\n");
|
|
@ -1,59 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300
|
|
||||||
+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300
|
|
||||||
@@ -40,6 +40,7 @@
|
|
||||||
#include <linux/socket.h> /* For memcpy_{to,from}iovec(). */
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
+#include <linux/skbuff.h>
|
|
||||||
|
|
||||||
#include "compat_highmem.h"
|
|
||||||
#include "compat_interrupt.h"
|
|
||||||
@@ -1196,21 +1197,21 @@
|
|
||||||
} else {
|
|
||||||
toCopy = size - bytesCopied;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */
|
|
||||||
if (isIovec) {
|
|
||||||
- struct iovec *iov = (struct iovec *)src;
|
|
||||||
- int err;
|
|
||||||
+ struct msghdr *msg = (struct msghdr *)src;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
- /* The iovec will track bytesCopied internally. */
|
|
||||||
- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
|
|
||||||
- if (err != 0) {
|
|
||||||
- if (kernelIf->host) {
|
|
||||||
- kunmap(kernelIf->u.h.page[pageIndex]);
|
|
||||||
+ /* The iovec will track bytes_copied internally. */
|
|
||||||
+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ if (kernelIf->host)
|
|
||||||
+ kunmap(kernelIf->u.h.page[pageIndex]);
|
|
||||||
+ return VMCI_ERROR_INVALID_ARGS;
|
|
||||||
}
|
|
||||||
- return VMCI_ERROR_INVALID_ARGS;
|
|
||||||
- }
|
|
||||||
- } else {
|
|
||||||
- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy);
|
|
||||||
+ } else {
|
|
||||||
+ memcpy((u8 *)va + pageOffset,
|
|
||||||
+ (u8 *)src + bytesCopied, toCopy);
|
|
||||||
}
|
|
||||||
|
|
||||||
bytesCopied += toCopy;
|
|
||||||
@@ -1273,11 +1274,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isIovec) {
|
|
||||||
- struct iovec *iov = (struct iovec *)dest;
|
|
||||||
+ struct msghdr *msg = (struct msghdr *)dest;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
/* The iovec will track bytesCopied internally. */
|
|
||||||
- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
|
|
||||||
+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
|
|
||||||
if (err != 0) {
|
|
||||||
if (kernelIf->host) {
|
|
||||||
kunmap(kernelIf->u.h.page[pageIndex]);
|
|
@ -1,25 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
|
|
||||||
--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
|
|
||||||
+++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
|
|
||||||
@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
|
|
||||||
* able to send.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
|
|
||||||
+ written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
|
|
||||||
len - totalWritten, 0);
|
|
||||||
if (written < 0) {
|
|
||||||
err = -ENOMEM;
|
|
||||||
@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flags & MSG_PEEK) {
|
|
||||||
- read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
|
|
||||||
+ read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
|
||||||
} else {
|
|
||||||
- read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
|
|
||||||
+ read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (read < 0) {
|
|
@ -1,16 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400
|
|
||||||
@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Place the datagram payload in the user's iovec. */
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
|
|
||||||
err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
|
|
||||||
+#else
|
|
||||||
+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
|
|
||||||
+#endif
|
|
||||||
if (err) {
|
|
||||||
goto out;
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
|
||||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
|
||||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400
|
|
||||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400
|
|
||||||
@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
|
|
||||||
+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
|
|
||||||
|
|
||||||
dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
|
|
||||||
dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
|
|
@ -1,61 +0,0 @@
|
|||||||
--- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200
|
|
||||||
+++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200
|
|
||||||
@@ -233,14 +233,10 @@
|
|
||||||
static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
|
|
||||||
char __user *optval, int __user * optlen);
|
|
||||||
|
|
||||||
-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
|
|
||||||
- struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
|
||||||
- struct msghdr *msg, size_t len, int flags);
|
|
||||||
-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
|
|
||||||
- struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
|
||||||
- struct msghdr *msg, size_t len, int flags);
|
|
||||||
+static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
+static int VSockVmciDgramRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
|
||||||
+static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
|
||||||
+static int VSockVmciStreamRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
|
||||||
|
|
||||||
static int VSockVmciCreate(
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
|
|
||||||
@@ -4211,8 +4207,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
-VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
- struct socket *sock, // IN: socket to send on
|
|
||||||
+VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on
|
|
||||||
struct msghdr *msg, // IN: message to send
|
|
||||||
size_t len) // IN: length of message
|
|
||||||
{
|
|
||||||
@@ -4541,8 +4536,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
-VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
- struct socket *sock, // IN: socket to send on
|
|
||||||
+VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on
|
|
||||||
struct msghdr *msg, // IN: message to send
|
|
||||||
size_t len) // IN: length of message
|
|
||||||
{
|
|
||||||
@@ -4710,8 +4704,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
-VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
- struct socket *sock, // IN: socket to receive from
|
|
||||||
+VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from
|
|
||||||
struct msghdr *msg, // IN/OUT: message to receive into
|
|
||||||
size_t len, // IN: length of receive buffer
|
|
||||||
int flags) // IN: receive flags
|
|
||||||
@@ -4803,8 +4796,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
-VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
|
|
||||||
- struct socket *sock, // IN: socket to receive from
|
|
||||||
+VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from
|
|
||||||
struct msghdr *msg, // IN/OUT: message to receive into
|
|
||||||
size_t len, // IN: length of receive buffer
|
|
||||||
int flags) // IN: receive flags
|
|
@ -1,56 +0,0 @@
|
|||||||
--- vmci-only/linux/driver.c 2015-02-07 01:11:55.000000000 +0100
|
|
||||||
+++ vmci-only/linux/driver.c.new 2015-07-23 00:28:25.713804866 +0200
|
|
||||||
@@ -37,6 +37,7 @@
|
|
||||||
#include <linux/moduleparam.h>
|
|
||||||
#include <linux/poll.h>
|
|
||||||
#include <linux/smp.h>
|
|
||||||
+#include <linux/vmalloc.h>
|
|
||||||
|
|
||||||
#include "compat_highmem.h"
|
|
||||||
#include "compat_interrupt.h"
|
|
||||||
--- vmblock-only/linux/inode.c 2015-08-23 00:34:11.959377109 +0200
|
|
||||||
+++ vmblock-only/linux/inode.c.new 2015-08-23 00:37:49.839389292 +0200
|
|
||||||
@@ -38,7 +38,9 @@
|
|
||||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
#else
|
|
||||||
static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
@@ -203,13 +205,19 @@
|
|
||||||
*----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+static const char *
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *
|
|
||||||
#else
|
|
||||||
static int
|
|
||||||
#endif
|
|
||||||
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+ void **cookie) // OUT: stores opaque pointer
|
|
||||||
+#else
|
|
||||||
struct nameidata *nd) // OUT: stores result
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
@@ -226,7 +234,11 @@
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+ return *cookie = iinfo->name;
|
|
||||||
+#else
|
|
||||||
nd_set_link(nd, iinfo->name);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
out:
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
@ -1,22 +0,0 @@
|
|||||||
--- vmnet-only/vmnetInt.h 2015-05-28 01:46:53.023206897 +0200
|
|
||||||
+++ vmnet-only/vmnetInt.h.new 2015-05-28 01:47:07.911207730 +0200
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
extern struct proto vmnet_proto;
|
|
||||||
#ifdef VMW_NETDEV_HAS_NET
|
|
||||||
# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
|
|
||||||
- PF_NETLINK, _pri, &vmnet_proto)
|
|
||||||
+ PF_NETLINK, _pri, &vmnet_proto, 0)
|
|
||||||
#else
|
|
||||||
# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)
|
|
||||||
#endif
|
|
||||||
--- vsock-only/linux/af_vsock.c 2015-05-28 01:50:03.553217551 +0200
|
|
||||||
+++ vsock-only/linux/af_vsock.c.new 2015-05-28 01:54:55.248233862 +0200
|
|
||||||
@@ -2829,7 +2829,7 @@
|
|
||||||
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
|
|
||||||
sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
|
|
||||||
#else
|
|
||||||
- sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);
|
|
||||||
+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0);
|
|
||||||
#endif
|
|
||||||
if (!sk) {
|
|
||||||
return NULL;
|
|
@ -1,27 +0,0 @@
|
|||||||
diff -ru work.old/vmci-only/linux/driver.c work/vmci-only/linux/driver.c
|
|
||||||
--- work.old/vmci-only/linux/driver.c 2015-09-14 21:07:49.751696932 +0200
|
|
||||||
+++ work/vmci-only/linux/driver.c 2015-09-14 22:10:48.015908198 +0200
|
|
||||||
@@ -2467,8 +2467,6 @@
|
|
||||||
static void __exit
|
|
||||||
vmci_exit(void)
|
|
||||||
{
|
|
||||||
- int retval;
|
|
||||||
-
|
|
||||||
if (guestDeviceInit) {
|
|
||||||
pci_unregister_driver(&vmci_driver);
|
|
||||||
vfree(data_buffer);
|
|
||||||
@@ -2480,12 +2478,8 @@
|
|
||||||
|
|
||||||
VMCI_HostCleanup();
|
|
||||||
|
|
||||||
- retval = misc_deregister(&linuxState.misc);
|
|
||||||
- if (retval) {
|
|
||||||
- Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
|
|
||||||
- } else {
|
|
||||||
- Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
|
|
||||||
- }
|
|
||||||
+ misc_deregister(&linuxState.misc);
|
|
||||||
+ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
|
|
||||||
|
|
||||||
hostDeviceInit = FALSE;
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
|
|
||||||
--- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200
|
|
||||||
+++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
|
|
||||||
@@ -387,9 +387,7 @@
|
|
||||||
#ifdef VMX86_DEVEL
|
|
||||||
unregister_chrdev(linuxState.major, linuxState.deviceName);
|
|
||||||
#else
|
|
||||||
- if (misc_deregister(&linuxState.misc)) {
|
|
||||||
- Warning("Module %s: error unregistering\n", linuxState.deviceName);
|
|
||||||
- }
|
|
||||||
+ misc_deregister(&linuxState.misc);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Log("Module %s: unloaded\n", linuxState.deviceName);
|
|
@ -1,67 +0,0 @@
|
|||||||
--- vmblock-only/linux/inode.c.old 2016-05-27 15:12:49.315632906 +0200
|
|
||||||
+++ vmblock-only/linux/inode.c 2016-05-27 22:57:39.550192422 +0200
|
|
||||||
@@ -44,7 +44,9 @@
|
|
||||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
|
||||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
|
||||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
|
||||||
@@ -63,7 +65,11 @@
|
|
||||||
struct inode_operations LinkInodeOps = {
|
|
||||||
#endif
|
|
||||||
.readlink = InodeOpReadlink,
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+ .get_link = InodeOpFollowlink,
|
|
||||||
+#else
|
|
||||||
.follow_link = InodeOpFollowlink,
|
|
||||||
+#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -231,7 +237,10 @@
|
|
||||||
static int
|
|
||||||
#endif
|
|
||||||
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+ struct inode *inode,
|
|
||||||
+ struct delayed_call *done)
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
void **cookie) // OUT: stores opaque pointer
|
|
||||||
#else
|
|
||||||
struct nameidata *nd) // OUT: stores result
|
|
||||||
@@ -241,18 +250,28 @@
|
|
||||||
VMBlockInodeInfo *iinfo;
|
|
||||||
|
|
||||||
if (!dentry) {
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+ ret = -ECHILD;
|
|
||||||
+#else
|
|
||||||
Warning("InodeOpReadlink: invalid args from kernel\n");
|
|
||||||
ret = -EINVAL;
|
|
||||||
+#endif
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+ iinfo = INODE_TO_IINFO(inode);
|
|
||||||
+#else
|
|
||||||
iinfo = INODE_TO_IINFO(dentry->d_inode);
|
|
||||||
+#endif
|
|
||||||
if (!iinfo) {
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
|
||||||
+ return iinfo->name;
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
|
||||||
return *cookie = iinfo->name;
|
|
||||||
#else
|
|
||||||
nd_set_link(nd, iinfo->name);
|
|
@ -1,68 +0,0 @@
|
|||||||
--- ./vmci-only/linux/driver.c.old 2016-05-19 19:00:09.784669042 +0200
|
|
||||||
+++ ./vmci-only/linux/driver.c 2016-05-19 19:00:47.480671150 +0200
|
|
||||||
@@ -1468,7 +1468,11 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+ retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
||||||
1, 1, 0, &page, NULL);
|
|
||||||
+#endif
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
||||||
--- ./vmci-only/linux/vmciKernelIf.c.old 2016-05-19 18:57:04.344658673 +0200
|
|
||||||
+++ ./vmci-only/linux/vmciKernelIf.c 2016-05-19 19:03:28.600680159 +0200
|
|
||||||
@@ -2049,6 +2049,13 @@
|
|
||||||
int err = VMCI_SUCCESS;
|
|
||||||
|
|
||||||
down_write(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+ retval = get_user_pages((VA)produceUVA,
|
|
||||||
+ produceQ->kernelIf->numPages,
|
|
||||||
+ 1, 0,
|
|
||||||
+ produceQ->kernelIf->u.h.headerPage,
|
|
||||||
+ NULL);
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current,
|
|
||||||
current->mm,
|
|
||||||
(VA)produceUVA,
|
|
||||||
@@ -2056,6 +2063,7 @@
|
|
||||||
1, 0,
|
|
||||||
produceQ->kernelIf->u.h.headerPage,
|
|
||||||
NULL);
|
|
||||||
+#endif
|
|
||||||
if (retval < produceQ->kernelIf->numPages) {
|
|
||||||
Log("get_user_pages(produce) failed (retval=%d)\n", retval);
|
|
||||||
VMCIReleasePages(produceQ->kernelIf->u.h.headerPage, retval, FALSE);
|
|
||||||
--- ./vmmon-only/linux/hostif.c.old 2016-05-19 18:50:42.872637343 +0200
|
|
||||||
+++ ./vmmon-only/linux/hostif.c 2016-05-19 18:53:40.208647259 +0200
|
|
||||||
@@ -1163,7 +1163,11 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, NULL);
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
|
|
||||||
numPages, 0, 0, ppages, NULL);
|
|
||||||
+#endif
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
||||||
--- ./vmnet-only/userif.c.old 2016-05-19 18:52:45.904644222 +0200
|
|
||||||
+++ ./vmnet-only/userif.c 2016-05-19 18:53:28.599646610 +0200
|
|
||||||
@@ -113,8 +113,12 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+ retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
||||||
- 1, 1, 0, &page, NULL);
|
|
||||||
+ 1, 1, 0, &page, NULL);
|
|
||||||
+#endif
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
|
|
||||||
if (retval != 1) {
|
|
@ -1,28 +0,0 @@
|
|||||||
--- ./vmci-only/linux/vmciKernelIf.c.old 2016-05-19 18:57:04.344658673 +0200
|
|
||||||
+++ ./vmci-only/linux/vmciKernelIf.c 2016-05-19 19:03:28.600680159 +0200
|
|
||||||
@@ -1835,7 +1835,11 @@
|
|
||||||
if (dirty) {
|
|
||||||
set_page_dirty(pages[i]);
|
|
||||||
}
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ put_page(pages[i]);
|
|
||||||
+#else
|
|
||||||
page_cache_release(pages[i]);
|
|
||||||
+#endif
|
|
||||||
pages[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2063,9 +2067,13 @@
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
|
|
||||||
+ retval = get_user_pages((VA)consumeUVA,
|
|
||||||
+#else
|
|
||||||
retval = get_user_pages(current,
|
|
||||||
current->mm,
|
|
||||||
(VA)consumeUVA,
|
|
||||||
+#endif
|
|
||||||
consumeQ->kernelIf->numPages,
|
|
||||||
1, 0,
|
|
||||||
consumeQ->kernelIf->u.h.headerPage,
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
|
|
||||||
+++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
|
|
||||||
@@ -465,7 +465,7 @@
|
|
||||||
VNetSend(&netIf->port.jack, skb);
|
|
||||||
|
|
||||||
netIf->stats.tx_packets++;
|
|
||||||
- dev->trans_start = jiffies;
|
|
||||||
+ netif_trans_update(dev);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200
|
|
||||||
+++ vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200
|
|
||||||
@@ -205,10 +205,11 @@
|
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
|
||||||
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
|
|
||||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
#else
|
|
||||||
- return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
+ return generic_readlink(dentry, buffer, buflen);
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
|
||||||
--- a/vmmon-only/linux/hostif.c 2016-08-13 16:54:18.935207507 +0300
|
|
||||||
+++ b/vmmon-only/linux/hostif.c 2016-08-13 16:53:52.981424256 +0300
|
|
||||||
@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
|
|
||||||
*/
|
|
||||||
#define LOCKED_PAGE_SLACK 10000
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
|
|
||||||
+#define NR_ANON_PAGES NR_ANON_MAPPED
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static struct {
|
|
||||||
Atomic_uint64 uptimeBase;
|
|
||||||
VersionedAtomic version;
|
|
@ -1,39 +0,0 @@
|
|||||||
--- ./vmci-only/linux/vmciKernelIf.c 2017-02-23 12:19:59.706822502 +0100
|
|
||||||
+++ ./vmci-only/linux/vmciKernelIf.c.new 2017-02-23 13:12:09.382997502 +0100
|
|
||||||
@@ -2056,7 +2056,11 @@
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
retval = get_user_pages((VA)produceUVA,
|
|
||||||
produceQ->kernelIf->numPages,
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
||||||
+ FOLL_WRITE,
|
|
||||||
+#else
|
|
||||||
1, 0,
|
|
||||||
+#endif
|
|
||||||
produceQ->kernelIf->u.h.headerPage,
|
|
||||||
NULL);
|
|
||||||
#else
|
|
||||||
@@ -2083,7 +2087,11 @@
|
|
||||||
(VA)consumeUVA,
|
|
||||||
#endif
|
|
||||||
consumeQ->kernelIf->numPages,
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
||||||
+ FOLL_WRITE,
|
|
||||||
+#else
|
|
||||||
1, 0,
|
|
||||||
+#endif
|
|
||||||
consumeQ->kernelIf->u.h.headerPage,
|
|
||||||
NULL);
|
|
||||||
if (retval < consumeQ->kernelIf->numPages) {
|
|
||||||
--- ./vmci-only/linux/driver.c 2017-02-23 12:19:59.645822499 +0100
|
|
||||||
+++ ./vmci-only/linux/driver.c.new 2017-02-23 12:30:38.845858240 +0100
|
|
||||||
@@ -1468,7 +1468,9 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
||||||
+ retval = get_user_pages(addr, 1, FOLL_WRITE, &page, NULL);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
|
|
||||||
#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
@ -1,26 +0,0 @@
|
|||||||
--- ./vmnet-only/userif.c 2017-02-23 12:29:00.909852764 +0100
|
|
||||||
+++ ./vmnet-only/userif.c.new 2017-02-23 12:28:51.309852227 +0100
|
|
||||||
@@ -113,7 +113,9 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
||||||
+ retval = get_user_pages(addr, 1, FOLL_WRITE, &page, NULL);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
|
|
||||||
#else
|
|
||||||
retval = get_user_pages(current, current->mm, addr,
|
|
||||||
--- ./vmmon-only/linux/hostif.c 2017-02-23 12:19:59.772822506 +0100
|
|
||||||
+++ ./vmmon-only/linux/hostif.c.new 2017-02-23 12:26:42.661845034 +0100
|
|
||||||
@@ -1167,7 +1167,9 @@
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
||||||
+ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, NULL);
|
|
||||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
|
||||||
retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, NULL);
|
|
||||||
#else
|
|
||||||
retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
|
|
@ -1,14 +0,0 @@
|
|||||||
--- vmblock-only/linux/inode.c 2017-02-21 08:38:50.844678686 -0700
|
|
||||||
+++ vmblock-only/linux/inode.c 2017-02-21 08:59:40.557917497 -0700
|
|
||||||
@@ -207,8 +207,10 @@
|
|
||||||
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
|
||||||
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
|
|
||||||
return readlink_copy(buffer, buflen, iinfo->name);
|
|
||||||
-#else
|
|
||||||
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 9, 99)
|
|
||||||
return generic_readlink(dentry, buffer, buflen);
|
|
||||||
+#else
|
|
||||||
+ return vfs_readlink(dentry, buffer, buflen);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
|||||||
--- vmblock-only/linux/inode.c 2017-05-06 16:54:57.000000000 +0200
|
|
||||||
+++ vmblock-only/linux/inode.c.new 2017-05-06 16:55:32.000000000 +0200
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#include <linux/fs.h>
|
|
||||||
#include <linux/time.h>
|
|
||||||
#include <linux/namei.h>
|
|
||||||
+#include <linux/cred.h>
|
|
||||||
|
|
||||||
#include "vmblockInt.h"
|
|
||||||
#include "filesystem.h"
|
|
||||||
--- vmci-only/linux/driver.c 2017-05-06 16:59:06.000000000 +0200
|
|
||||||
+++ vmci-only/linux/driver.c.new 2017-05-06 17:00:03.000000000 +0200
|
|
||||||
@@ -38,6 +38,7 @@
|
|
||||||
#include <linux/poll.h>
|
|
||||||
#include <linux/smp.h>
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
+#include <linux/cred.h>
|
|
||||||
|
|
||||||
#include "compat_highmem.h"
|
|
||||||
#include "compat_interrupt.h"
|
|
||||||
--- vmci-only/linux/vmciKernelIf.c 2017-05-06 17:00:42.000000000 +0200
|
|
||||||
+++ vmci-only/linux/vmciKernelIf.c.new 2017-05-06 17:01:24.000000000 +0200
|
|
||||||
@@ -41,6 +41,7 @@
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
#include <linux/skbuff.h>
|
|
||||||
+#include <linux/sched/signal.h>
|
|
||||||
|
|
||||||
#include "compat_highmem.h"
|
|
||||||
#include "compat_interrupt.h"
|
|
||||||
--- vsock-only/linux/af_vsock.c 2017-05-06 17:02:05.000000000 +0200
|
|
||||||
+++ vsock-only/linux/af_vsock.c.new 2017-05-06 17:02:49.000000000 +0200
|
|
||||||
@@ -106,6 +106,7 @@
|
|
||||||
#include <linux/list.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
#include <linux/init.h>
|
|
||||||
+#include <linux/sched/signal.h>
|
|
||||||
#include <asm/io.h>
|
|
||||||
#if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
|
|
||||||
# include <linux/ioctl32.h>
|
|
@ -1,20 +0,0 @@
|
|||||||
--- vmmon-only/linux/hostif.c 2017-05-06 16:56:09.000000000 +0200
|
|
||||||
+++ vmmon-only/linux/hostif.c.new 2017-05-06 16:56:41.000000000 +0200
|
|
||||||
@@ -73,6 +73,7 @@
|
|
||||||
#include <linux/capability.h>
|
|
||||||
#include <linux/kthread.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
+#include <linux/sched/signal.h>
|
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
--- vmnet-only/userif.c 2017-03-13 04:05:59.000000000 +0100
|
|
||||||
+++ vmnet-only/userif.c.new 2017-05-06 16:58:32.000000000 +0200
|
|
||||||
@@ -36,6 +36,7 @@
|
|
||||||
#include <linux/slab.h>
|
|
||||||
#include <linux/version.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
+#include <linux/sched/signal.h>
|
|
||||||
|
|
||||||
#include <net/checksum.h>
|
|
||||||
#include <net/sock.h>
|
|
@ -1,21 +0,0 @@
|
|||||||
--- vsock-only/linux/af_vsock.c 2017-05-21 00:58:02.900776185 +0200
|
|
||||||
+++ vsock-only/linux/af_vsock.c.new 2017-05-21 00:57:18.932773727 +0200
|
|
||||||
@@ -213,7 +213,7 @@
|
|
||||||
struct sockaddr *addr, int addrLen, int flags);
|
|
||||||
static int VSockVmciStreamConnect(struct socket *sock,
|
|
||||||
struct sockaddr *addr, int addrLen, int flags);
|
|
||||||
-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags);
|
|
||||||
+static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags, bool kern);
|
|
||||||
static int VSockVmciGetname(struct socket *sock,
|
|
||||||
struct sockaddr *addr, int *addrLen, int peer);
|
|
||||||
static unsigned int VSockVmciPoll(struct file *file,
|
|
||||||
@@ -3772,7 +3772,8 @@
|
|
||||||
static int
|
|
||||||
VSockVmciAccept(struct socket *sock, // IN
|
|
||||||
struct socket *newsock, // IN/OUT
|
|
||||||
- int flags) // IN
|
|
||||||
+ int flags, // IN
|
|
||||||
+ bool kern) // IN
|
|
||||||
{
|
|
||||||
struct sock *listener;
|
|
||||||
int err;
|
|
@ -1,30 +0,0 @@
|
|||||||
diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
|
|
||||||
--- old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.000000000 +0200
|
|
||||||
+++ vmmon-only/linux/driver.c 2017-03-06 10:46:33.347053458 +0200
|
|
||||||
@@ -105,7 +105,7 @@
|
|
||||||
static int LinuxDriver_Close(struct inode *inode, struct file *filp);
|
|
||||||
static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
|
|
||||||
#if defined(VMW_NOPAGE_2624)
|
|
||||||
-static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
|
|
||||||
+static int LinuxDriverFault(struct vm_fault *fault);
|
|
||||||
#else
|
|
||||||
static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
|
|
||||||
unsigned long address,
|
|
||||||
@@ -882,15 +882,14 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(VMW_NOPAGE_2624)
|
|
||||||
-static int LinuxDriverFault(struct vm_area_struct *vma, //IN
|
|
||||||
- struct vm_fault *fault) //IN/OUT
|
|
||||||
+static int LinuxDriverFault(struct vm_fault *fault) //IN/OUT
|
|
||||||
#else
|
|
||||||
static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
|
|
||||||
unsigned long address, //IN
|
|
||||||
int *type) //OUT: Fault type
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
- VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
|
|
||||||
+ VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
|
|
||||||
unsigned long pg;
|
|
||||||
struct page* page;
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
|
||||||
index f1f4b10..c43242f 100644
|
|
||||||
--- a/vmmon-only/linux/hostif.c
|
|
||||||
+++ b/vmmon-only/linux/hostif.c
|
|
||||||
@@ -55,6 +55,7 @@
|
|
||||||
#include <linux/kthread.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
|
|
||||||
+#include <asm/apic.h>
|
|
||||||
|
|
||||||
#include "vmware.h"
|
|
||||||
#include "x86apic.h"
|
|
@ -1,89 +0,0 @@
|
|||||||
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
|
|
||||||
index b21dd44..960c2aa 100644
|
|
||||||
--- a/vmmon-only/linux/driver.c
|
|
||||||
+++ b/vmmon-only/linux/driver.c
|
|
||||||
@@ -178,7 +178,16 @@ static struct vm_operations_struct vmuser_mops = {
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
-static struct file_operations vmuser_fops;
|
|
||||||
+static struct file_operations vmuser_fops = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .poll = LinuxDriverPoll,
|
|
||||||
+ .unlocked_ioctl = LinuxDriver_Ioctl,
|
|
||||||
+ .compat_ioctl = LinuxDriver_Ioctl,
|
|
||||||
+ .open = LinuxDriver_Open,
|
|
||||||
+ .release = LinuxDriver_Close,
|
|
||||||
+ .mmap = LinuxDriverMmap
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static struct timer_list tscTimer;
|
|
||||||
static Atomic_uint32 tsckHz;
|
|
||||||
static VmTimeStart tsckHzStartTime;
|
|
||||||
@@ -357,21 +372,6 @@ init_module(void)
|
|
||||||
linuxState.fastClockPriority = -20;
|
|
||||||
linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Initialize the file_operations structure. Because this code is always
|
|
||||||
- * compiled as a module, this is fine to do it here and not in a static
|
|
||||||
- * initializer.
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
|
|
||||||
- vmuser_fops.owner = THIS_MODULE;
|
|
||||||
- vmuser_fops.poll = LinuxDriverPoll;
|
|
||||||
- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
|
|
||||||
- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
|
|
||||||
- vmuser_fops.open = LinuxDriver_Open;
|
|
||||||
- vmuser_fops.release = LinuxDriver_Close;
|
|
||||||
- vmuser_fops.mmap = LinuxDriverMmap;
|
|
||||||
-
|
|
||||||
#ifdef VMX86_DEVEL
|
|
||||||
devel_init_module();
|
|
||||||
linuxState.minor = 0;
|
|
||||||
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
|
|
||||||
index b12b982..40bd4cf 100644
|
|
||||||
--- a/vmnet-only/driver.c
|
|
||||||
+++ b/vmnet-only/driver.c
|
|
||||||
@@ -165,7 +165,16 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
|
|
||||||
unsigned int iocmd, unsigned long ioarg);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static struct file_operations vnetFileOps;
|
|
||||||
+static struct file_operations vnetFileOps = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .read = VNetFileOpRead,
|
|
||||||
+ .write = VNetFileOpWrite,
|
|
||||||
+ .poll = VNetFileOpPoll,
|
|
||||||
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
|
|
||||||
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
|
|
||||||
+ .open = VNetFileOpOpen,
|
|
||||||
+ .release = VNetFileOpClose
|
|
||||||
+};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Utility functions
|
|
||||||
@@ -476,22 +491,6 @@ init_module(void)
|
|
||||||
goto err_proto;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Initialize the file_operations structure. Because this code is always
|
|
||||||
- * compiled as a module, this is fine to do it here and not in a static
|
|
||||||
- * initializer.
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
- memset(&vnetFileOps, 0, sizeof vnetFileOps);
|
|
||||||
- vnetFileOps.owner = THIS_MODULE;
|
|
||||||
- vnetFileOps.read = VNetFileOpRead;
|
|
||||||
- vnetFileOps.write = VNetFileOpWrite;
|
|
||||||
- vnetFileOps.poll = VNetFileOpPoll;
|
|
||||||
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
|
|
||||||
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
|
|
||||||
- vnetFileOps.open = VNetFileOpOpen;
|
|
||||||
- vnetFileOps.release = VNetFileOpClose;
|
|
||||||
-
|
|
||||||
retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
|
|
||||||
if (retval) {
|
|
||||||
LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
|
|
@ -1,65 +0,0 @@
|
|||||||
diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
|
|
||||||
index ab7a727..e3ec9d2 100644
|
|
||||||
--- a/vmblock-only/Makefile.kernel
|
|
||||||
+++ b/vmblock-only/Makefile.kernel
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
INCLUDE += -I$(SRCROOT)/include
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
|
|
||||||
diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
|
|
||||||
index ba343ee..861ea83 100644
|
|
||||||
--- a/vmci-only/Makefile.kernel
|
|
||||||
+++ b/vmci-only/Makefile.kernel
|
|
||||||
@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
|
|
||||||
|
|
||||||
INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
obj-m += $(DRIVER).o
|
|
||||||
|
|
||||||
diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
|
|
||||||
index 8770d1d..c4746c3 100644
|
|
||||||
--- a/vmmon-only/Makefile.kernel
|
|
||||||
+++ b/vmmon-only/Makefile.kernel
|
|
||||||
@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
|
|
||||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
|
|
||||||
-I$(SRCROOT)/vmcore
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
|
|
||||||
|
|
||||||
diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
|
|
||||||
index d1e3133..665d428 100644
|
|
||||||
--- a/vmnet-only/Makefile.kernel
|
|
||||||
+++ b/vmnet-only/Makefile.kernel
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
INCLUDE := -I$(SRCROOT)
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
|
|
||||||
diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
|
|
||||||
index b4629ee..264b8cb 100644
|
|
||||||
--- a/vsock-only/Makefile.kernel
|
|
||||||
+++ b/vsock-only/Makefile.kernel
|
|
||||||
@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
|
|
||||||
INCLUDE += -I$(SRCROOT)/linux
|
|
||||||
INCLUDE += -I$(SRCROOT)/common
|
|
||||||
|
|
||||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
|
||||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
|
||||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
|||||||
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
|
|
||||||
index 2b81323..746c8b8 100644
|
|
||||||
--- a/vmblock-only/Makefile
|
|
||||||
+++ b/vmblock-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmblock
|
|
||||||
PRODUCT := ws
|
|
||||||
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
|
|
||||||
index 8e9c5be..6ec828b 100644
|
|
||||||
--- a/vmci-only/Makefile
|
|
||||||
+++ b/vmci-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmci
|
|
||||||
PRODUCT := ws
|
|
||||||
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
|
|
||||||
index 5bd867b..91a83d4 100644
|
|
||||||
--- a/vmmon-only/Makefile
|
|
||||||
+++ b/vmmon-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmmon
|
|
||||||
PRODUCT := @@PRODUCT@@
|
|
||||||
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
|
|
||||||
index d4eb73c..c7c6d38 100644
|
|
||||||
--- a/vmnet-only/Makefile
|
|
||||||
+++ b/vmnet-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vmnet
|
|
||||||
PRODUCT := @@PRODUCT@@
|
|
||||||
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
|
|
||||||
index 93dd61d..9765696 100644
|
|
||||||
--- a/vsock-only/Makefile
|
|
||||||
+++ b/vsock-only/Makefile
|
|
||||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
|
||||||
ifdef LINUXINCLUDE
|
|
||||||
HEADER_DIR = $(LINUXINCLUDE)
|
|
||||||
else
|
|
||||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
|
||||||
+HEADER_DIR = $(KERNEL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-BUILD_DIR = $(HEADER_DIR)/..
|
|
||||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
|
||||||
|
|
||||||
DRIVER := vsock
|
|
||||||
PRODUCT := ws
|
|
@ -1,24 +0,0 @@
|
|||||||
diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
|
|
||||||
index 7a56304..9ff4548 100644
|
|
||||||
--- a/vmnet-only/compat_netdevice.h
|
|
||||||
+++ b/vmnet-only/compat_netdevice.h
|
|
||||||
@@ -47,6 +47,19 @@
|
|
||||||
# define net_device device
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* it looks like these have been removed from the kernel 3.1
|
|
||||||
+ * probably because the "transition" is considered complete.
|
|
||||||
+ * so to keep this source compatible we just redefine them like they were
|
|
||||||
+ * previously
|
|
||||||
+ */
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
|
|
||||||
+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
|
|
||||||
+ functions are available. */
|
|
||||||
+#define HAVE_FREE_NETDEV /* free_netdev() */
|
|
||||||
+#define HAVE_NETDEV_PRIV /* netdev_priv() */
|
|
||||||
+#define HAVE_NETIF_QUEUE
|
|
||||||
+#define HAVE_NET_DEVICE_OPS
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
|
|
@ -1,162 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic linux-info linux-mod user versionator udev
|
|
||||||
|
|
||||||
PV_MAJOR=$(get_major_version)
|
|
||||||
PV_MINOR=$(get_version_component_range 2-3)
|
|
||||||
|
|
||||||
DESCRIPTION="VMware kernel modules"
|
|
||||||
HOMEPAGE="http://www.vmware.com/"
|
|
||||||
|
|
||||||
SRC_URI=""
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="pax_kernel +vmci +vsock"
|
|
||||||
REQUIRED_USE="!vsock? ( !vmci )"
|
|
||||||
|
|
||||||
RDEPEND=""
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
|| ( =app-emulation/vmware-player-12.${PV_MINOR}*
|
|
||||||
=app-emulation/vmware-workstation-12.${PV_MINOR}* )"
|
|
||||||
|
|
||||||
S=${WORKDIR}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
CONFIG_CHECK="~HIGH_RES_TIMERS"
|
|
||||||
if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} BKL"
|
|
||||||
fi
|
|
||||||
if use vmci ; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
|
|
||||||
else
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
|
|
||||||
fi
|
|
||||||
if use vsock ; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
|
|
||||||
else
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux-info_pkg_setup
|
|
||||||
|
|
||||||
linux-mod_pkg_setup
|
|
||||||
|
|
||||||
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
|
||||||
|
|
||||||
VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
|
|
||||||
VMWARE_MODULE_LIST="vmblock vmmon vmnet"
|
|
||||||
use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
|
|
||||||
use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
|
|
||||||
|
|
||||||
VMWARE_MOD_DIR="${PN}-${PVR}"
|
|
||||||
|
|
||||||
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
|
||||||
|
|
||||||
enewgroup "${VMWARE_GROUP}"
|
|
||||||
|
|
||||||
filter-flags -mfpmath=sse -mavx -mpclmul -maes
|
|
||||||
append-cflags -mno-sse # Found a problem similar to bug #492964
|
|
||||||
|
|
||||||
for mod in ${VMWARE_MODULE_LIST}; do
|
|
||||||
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
cd "${S}"
|
|
||||||
for mod in ${VMWARE_MODULE_LIST_ALL}; do
|
|
||||||
tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
|
|
||||||
use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
|
|
||||||
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
|
|
||||||
kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
|
|
||||||
kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
|
|
||||||
kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
|
|
||||||
kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
|
|
||||||
kernel_is ge 4 1 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
|
|
||||||
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
|
|
||||||
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
|
|
||||||
kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
|
|
||||||
kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
|
|
||||||
kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p1.patch"
|
|
||||||
kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p2.patch"
|
|
||||||
kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
|
|
||||||
kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
|
|
||||||
kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
|
|
||||||
kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
|
|
||||||
kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p2.patch"
|
|
||||||
kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch"
|
|
||||||
|
|
||||||
# Allow user patches so they can support RC kernels and whatever else
|
|
||||||
epatch_user
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
linux-mod_src_install
|
|
||||||
local udevrules="${T}/60-vmware.rules"
|
|
||||||
cat > "${udevrules}" <<-EOF
|
|
||||||
KERNEL=="vmci", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vmw_vmci", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vmmon", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vsock", GROUP="vmware", MODE="660"
|
|
||||||
EOF
|
|
||||||
udev_dorules "${udevrules}"
|
|
||||||
|
|
||||||
if ! use vmci ; then
|
|
||||||
dodir /etc/modprobe.d/
|
|
||||||
|
|
||||||
cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
|
|
||||||
# Support for vmware vmci in kernel module
|
|
||||||
alias vmci vmw_vmci
|
|
||||||
EOF
|
|
||||||
|
|
||||||
export installed_modprobe_conf=1
|
|
||||||
fi
|
|
||||||
if ! use vsock ; then
|
|
||||||
dodir /etc/modprobe.d/
|
|
||||||
cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
|
|
||||||
# Support for vmware vsock in kernel module
|
|
||||||
alias vsock vmw_vsock_vmci_transport
|
|
||||||
EOF
|
|
||||||
|
|
||||||
export installed_modprobe_conf=1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
linux-mod_pkg_postinst
|
|
||||||
if [ "${installed_modprobe_conf}"x == "x" ] ; then
|
|
||||||
if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
|
|
||||||
ewarn "Please check the /etc/modprobe.d/vmware.conf file and"
|
|
||||||
ewarn "possible conflicts when using vmci and/or vsock modules built"
|
|
||||||
ewarn "out of kernel"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,157 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic linux-info linux-mod user versionator udev
|
|
||||||
|
|
||||||
PV_MAJOR=$(get_major_version)
|
|
||||||
PV_MINOR=$(get_version_component_range 2-3)
|
|
||||||
|
|
||||||
DESCRIPTION="VMware kernel modules"
|
|
||||||
HOMEPAGE="http://www.vmware.com/"
|
|
||||||
|
|
||||||
SRC_URI=""
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="pax_kernel +vmci +vsock"
|
|
||||||
REQUIRED_USE="!vsock? ( !vmci )"
|
|
||||||
|
|
||||||
RDEPEND=""
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
|| ( =app-emulation/vmware-player-12.${PV_MINOR}*
|
|
||||||
=app-emulation/vmware-workstation-12.${PV_MINOR}* )"
|
|
||||||
|
|
||||||
S=${WORKDIR}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
CONFIG_CHECK="~HIGH_RES_TIMERS"
|
|
||||||
if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} BKL"
|
|
||||||
fi
|
|
||||||
if use vmci ; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
|
|
||||||
else
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
|
|
||||||
fi
|
|
||||||
if use vsock ; then
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
|
|
||||||
else
|
|
||||||
CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux-info_pkg_setup
|
|
||||||
|
|
||||||
linux-mod_pkg_setup
|
|
||||||
|
|
||||||
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
|
||||||
|
|
||||||
VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
|
|
||||||
VMWARE_MODULE_LIST="vmblock vmmon vmnet"
|
|
||||||
use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
|
|
||||||
use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
|
|
||||||
|
|
||||||
VMWARE_MOD_DIR="${PN}-${PVR}"
|
|
||||||
|
|
||||||
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
|
||||||
|
|
||||||
enewgroup "${VMWARE_GROUP}"
|
|
||||||
|
|
||||||
filter-flags -mfpmath=sse -mavx -mpclmul -maes
|
|
||||||
append-cflags -mno-sse # Found a problem similar to bug #492964
|
|
||||||
|
|
||||||
for mod in ${VMWARE_MODULE_LIST}; do
|
|
||||||
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
cd "${S}"
|
|
||||||
for mod in ${VMWARE_MODULE_LIST_ALL}; do
|
|
||||||
tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
|
|
||||||
use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
|
|
||||||
epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
|
|
||||||
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
|
|
||||||
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
|
|
||||||
kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
|
|
||||||
kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
|
|
||||||
kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
|
|
||||||
kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
|
|
||||||
kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
|
|
||||||
kernel_is ge 4 1 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
|
|
||||||
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
|
|
||||||
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
|
|
||||||
kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
|
|
||||||
kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
|
|
||||||
kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p2.patch"
|
|
||||||
kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
|
|
||||||
kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
|
|
||||||
kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
|
|
||||||
kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
|
|
||||||
kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
|
|
||||||
|
|
||||||
# Allow user patches so they can support RC kernels and whatever else
|
|
||||||
epatch_user
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
linux-mod_src_install
|
|
||||||
local udevrules="${T}/60-vmware.rules"
|
|
||||||
cat > "${udevrules}" <<-EOF
|
|
||||||
KERNEL=="vmci", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vmw_vmci", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vmmon", GROUP="vmware", MODE="660"
|
|
||||||
KERNEL=="vsock", GROUP="vmware", MODE="660"
|
|
||||||
EOF
|
|
||||||
udev_dorules "${udevrules}"
|
|
||||||
|
|
||||||
if ! use vmci ; then
|
|
||||||
dodir /etc/modprobe.d/
|
|
||||||
|
|
||||||
cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
|
|
||||||
# Support for vmware vmci in kernel module
|
|
||||||
alias vmci vmw_vmci
|
|
||||||
EOF
|
|
||||||
|
|
||||||
export installed_modprobe_conf=1
|
|
||||||
fi
|
|
||||||
if ! use vsock ; then
|
|
||||||
dodir /etc/modprobe.d/
|
|
||||||
cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
|
|
||||||
# Support for vmware vsock in kernel module
|
|
||||||
alias vsock vmw_vsock_vmci_transport
|
|
||||||
EOF
|
|
||||||
|
|
||||||
export installed_modprobe_conf=1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
linux-mod_pkg_postinst
|
|
||||||
if [ "${installed_modprobe_conf}"x == "x" ] ; then
|
|
||||||
if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
|
|
||||||
ewarn "Please check the /etc/modprobe.d/vmware.conf file and"
|
|
||||||
ewarn "possible conflicts when using vmci and/or vsock modules built"
|
|
||||||
ewarn "out of kernel"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
DIST vmware-tools-freebsd-10.1.6-5214329.x86_64.component.tar 17018880 SHA256 ec7cd266d29d058850f8911e9cedee57d0cc4a1e6023fd6d22fbb1e7dc3a481a SHA512 f9a9219d207012861120a9856726a291de2232787a8eb2f31623c48285406fdc010326cbf56e0adb513ca21d67f4ce8356e0b9923c476f0fdce29cb815aebabf WHIRLPOOL b7f0ee65c1e651b4758c8ce764370733cc33d8972c7b62674fa3ce3bc477c54c42f110f36e4a3fd8ca91e7808f0559782f90a7af9f3426bfd8d2f9045384d23f
|
|
||||||
DIST vmware-tools-linux-10.1.6-5214329.x86_64.component.tar 55818240 SHA256 1d2a18bb06ef69c2a25a0b12402fe924c0e3cd5273923045e6b6e5e7b15edd93 SHA512 9548cdebd8495837328fc95c1268bce4e98fd308368892fd407c0284376c6920685cef395b3230eddee8b797fbc0814a8cc8f18d350e2de0eb5bfc997100f8d8 WHIRLPOOL 63feea13b3537fdd375faa05a3577e08603911875e7142747943854dd226949cce9c3ef1be770f3189061c994c9bb278b455ee6ce1da8187b75cf1cda399da11
|
|
||||||
DIST vmware-tools-netware-10.1.6-5214329.x86_64.component.tar 81920 SHA256 98fdf6d2fcfc77e2e6bd5d369eb5b3269c3b6e34cac4c8cc356ebc979a431bf0 SHA512 6807e9fb9559dfd25acbb689f675e49f26753271bf0f4371ce7a5e23ee16eaf5f821ed89d39fe0475bb61d9e1e26f146d2e5229bef3a75634c3d2d03c225c3a8 WHIRLPOOL 73b10aae360d43313e405a211f244dde054e1d336398a3dada175f4c74173018b1da99b038b33146d90a841c1fe511e558f911e6700e1a0a00e95e7ca06ce181
|
|
||||||
DIST vmware-tools-solaris-10.1.6-5214329.x86_64.component.tar 16107520 SHA256 b6fdfb4d12735c68ec15139fa9b3a28d3e331397a55a99f3a72365e62de5c869 SHA512 73a349b9785fa33e12ec17dbc52a5ed7dd41e2ccebee73b9bd60767a7637e527cdd9c246e6bff9c66c648efc529d8c0d7cc16538de4f7d0d10542b6c74c66164 WHIRLPOOL ed4d66462a6ea82be750e3539ffa08d1c4e43f55390a3925223f1ea1b59d9fdee8eb1d4b8b73e15c16be9260e07887e71b0a8c42cff9d95136161a34f57b7233
|
|
||||||
DIST vmware-tools-winPre2k-10.1.6-5214329.x86_64.component.tar 11530240 SHA256 0b7098e7a00ce7d4bc3e32a0b6440d2bedbed15d2692c9bbd0e431da88f78ee9 SHA512 8ec328019380da0a967404e35230f192d30298a192bef61cdeef0a2ec989afe72024dfccb08d5a0207739a71dd163e375dcdb7fba7d13bef431a851141decaf7 WHIRLPOOL f2d6e3347e007121edbaae1ecb78e5a23301d03eb2075737990bdca8157360ccb84e82b165617c00355553b9197df416b3bcfde4f15eb515e9db7032502e2756
|
|
||||||
DIST vmware-tools-windows-10.1.6-5214329.x86_64.component.tar 83640320 SHA256 fa12352507af0e097c9e8e6a0c638f93a3d5a3326b3218384438a58b8d0bd933 SHA512 040da7f2504ea77c0c3bd54a93f480d24752a0f5d29c40abe00e2d1d9e217f5a35d115a670fabbe2db5f36833f40d6cc8e28251fe745cc9bcc619e2c217aa7e2 WHIRLPOOL b80e049f9037aea47004983f3576939b00a52ed550d1c3864a6ed02d810542367ad6c10b993852b358de550e116fd9127e8cffa1844b47b6848781ef17937810
|
|
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>vmware@gentoo.org</email>
|
|
||||||
<name>Gentoo VMware Project</name>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
@ -1,58 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
inherit versionator vmware-bundle
|
|
||||||
|
|
||||||
MY_PV="$(replace_version_separator 3 - $PV)"
|
|
||||||
BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.5.6/5528349/linux/packages/"
|
|
||||||
|
|
||||||
DESCRIPTION="VMware Tools for guest operating systems"
|
|
||||||
HOMEPAGE="http://www.vmware.com/products/player/"
|
|
||||||
|
|
||||||
LICENSE="vmware"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
RESTRICT="mirror"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
DEPEND=""
|
|
||||||
RDEPEND=""
|
|
||||||
|
|
||||||
IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
|
|
||||||
|
|
||||||
VM_INSTALL_DIR="/opt/vmware"
|
|
||||||
|
|
||||||
for guest in ${IUSE_VMWARE_GUEST} ; do
|
|
||||||
SRC_URI+=" vmware_guest_${guest}? (
|
|
||||||
amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
|
|
||||||
)"
|
|
||||||
IUSE+=" vmware_guest_${guest}"
|
|
||||||
done ; unset guest
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
local arch
|
|
||||||
if use x86 ; then arch='i386'
|
|
||||||
elif use amd64 ; then arch='x86_64'
|
|
||||||
fi
|
|
||||||
local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
|
|
||||||
if use "vmware_guest_${guest}" ; then
|
|
||||||
local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
|
|
||||||
unpack "${component}.tar"
|
|
||||||
vmware-bundle_extract-component "${component}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
|
|
||||||
local somethingdone;
|
|
||||||
local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
|
|
||||||
if use "vmware_guest_${guest}" ; then
|
|
||||||
doins "${guest}".iso{,.sig}
|
|
||||||
somethingdone=yes
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
[ -n "${somethingdone}" ] || ewarn "You should set VMWARE_GUEST in make.conf to specify which operating systems you need."
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
DIST VMware-Workstation-12.1.1-3770994.x86_64.bundle.tar 176445440 SHA256 a2c1888e6360245cf65fd19e86b7f74c63788e652145dc9a786aebbda0dd9e15 SHA512 55880e7aa6f7c968d82c88f36c1f406f587cccc9e25bdb9d1de1ffcfccb609811c525967bb2fefcf6375ce59f0f78d4dcc258c006b4a0db642dc3233e8fc9556 WHIRLPOOL 833eceedc1e9b7f3a0b73a039d1647faa9a5966a8a34e26c4955348092ebd9983f2f0ba2b8acb37805b339f492278916d06d68db7bb52a219126d7e78b02c469
|
|
||||||
DIST VMware-Workstation-12.5.6-5528349.x86_64.bundle.tar 165724160 SHA256 c7d5ecb72cb62f8d8538f581cff4513f7ede261671a1f6c50a54afa5d05fec39 SHA512 cce68510e01245aa8bf66dbb108121f1d94c69ba7fcc33b7fe9c16a40910a553fb4a43cbf5b5c5f0445bda90686568af56f28e16a3b321b760da3c084554359b WHIRLPOOL 06dc3de1665c8cd6ad54ad4c1678003e153e4f1dc14c831e5ee7350042c1ec80478565291ea099da1568878333c737b829d9124545322e7988ebc2c19accfd4d
|
|
||||||
DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
|
|
@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
action="$1"
|
|
||||||
|
|
||||||
case $action in
|
|
||||||
add)
|
|
||||||
rc-update -q add vmware-workstation-server default
|
|
||||||
rc-service vmware-workstation-server start
|
|
||||||
;;
|
|
||||||
remove)
|
|
||||||
rc-update -q del vmware-workstation-server default
|
|
||||||
rc-service vmware-workstation-server stop
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
rc-service -q vmware-workstation-server status
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
|
|
||||||
|
|
||||||
<xsl:output omit-xml-declaration="yes"/>
|
|
||||||
|
|
||||||
<xsl:template match="text()"/>
|
|
||||||
|
|
||||||
<xsl:template match="/bundle/components/component">
|
|
||||||
<xsl:value-of select="@offset"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
<xsl:value-of select="@size"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
<xsl:value-of select="@name"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
</xsl:template>
|
|
||||||
|
|
||||||
</xsl:stylesheet>
|
|
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
|
|
||||||
|
|
||||||
<xsl:output omit-xml-declaration="yes"/>
|
|
||||||
|
|
||||||
<xsl:template match="text()"/>
|
|
||||||
|
|
||||||
<xsl:template match="/component/fileset/file">
|
|
||||||
<xsl:value-of select="@offset"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
<xsl:value-of select="@compressedSize"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
<xsl:value-of select="@uncompressedSize"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
<xsl:value-of select="@path"/>
|
|
||||||
<xsl:text> </xsl:text>
|
|
||||||
</xsl:template>
|
|
||||||
|
|
||||||
</xsl:stylesheet>
|
|
@ -1,44 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -vq vmci || modprobe -v vmw_vmci
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# vmci or vmw_vmci was loaded by the previous modprobe
|
|
||||||
# no need to do it here
|
|
||||||
modprobe -av vmmon vsock vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vsock vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -rvq vmci || modprobe -rv vmw_vmci
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -vq vmci || modprobe -v vmw_vmci
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# vmci or vmw_vmci was loaded by the previous modprobe
|
|
||||||
# no need to do it here
|
|
||||||
modprobe -av vmmon vsock vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vsock vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -rvq vmci || modprobe -rv vmw_vmci
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -vq vmci || modprobe -v vmw_vmci
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# vmci or vmw_vmci was loaded by the previous modprobe
|
|
||||||
# no need to do it here
|
|
||||||
modprobe -av vmmon vsock vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vsock vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -rvq vmci || modprobe -rv vmw_vmci
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -vq vmci || modprobe -v vmw_vmci
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# vmci or vmw_vmci was loaded by the previous modprobe
|
|
||||||
# no need to do it here
|
|
||||||
modprobe -av vmmon vsock vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vsock vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# quiet for vmci because it may not be there
|
|
||||||
modprobe -rvq vmci || modprobe -rv vmw_vmci
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,92 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
|
|
||||||
# vmci might be:
|
|
||||||
# 1) built as external kernel module
|
|
||||||
# 2) built as internal kernel module (with name vmw_vmci)
|
|
||||||
# 3) embedded in the kernel
|
|
||||||
for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
|
|
||||||
/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
|
|
||||||
do
|
|
||||||
if [[ -f "${mod}" ]] ; then
|
|
||||||
modprobe -v $(basename "${mod}" .ko)
|
|
||||||
eend $?
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# vsock might be:
|
|
||||||
# 1) built as external kernel module
|
|
||||||
# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
|
|
||||||
# 3) embedded in the kernel
|
|
||||||
for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
|
|
||||||
/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
|
|
||||||
do
|
|
||||||
if [[ -f "${mod}" ]] ; then
|
|
||||||
modprobe -v $(basename "${mod}" .ko)
|
|
||||||
eend $?
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# vmci or vsock were already loaded by the previous modprobe,
|
|
||||||
# no need to do it here
|
|
||||||
modprobe -av vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
# vsock might be:
|
|
||||||
# 1) built as external kernel module
|
|
||||||
# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
|
|
||||||
# 3) embedded in the kernel
|
|
||||||
for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
|
|
||||||
/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
|
|
||||||
do
|
|
||||||
if [[ -f "${mod}" ]] ; then
|
|
||||||
modprobe -rv $(basename "${mod}" .ko)
|
|
||||||
eend $?
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# vmci might be:
|
|
||||||
# 1) built as external kernel module
|
|
||||||
# 2) built as internal kernel module (with name vmw_vmci)
|
|
||||||
# 3) embedded in the kernel
|
|
||||||
for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
|
|
||||||
/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
|
|
||||||
do
|
|
||||||
if [[ -f "${mod}" ]] ; then
|
|
||||||
modprobe -rv $(basename "${mod}" .ko)
|
|
||||||
eend $?
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin Starting VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
@@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware services
|
|
||||||
modprobe -v vmci || modprobe -v vmw_vmci
|
|
||||||
eend $?
|
|
||||||
modprobe -av vmmon vmci vsock vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --start
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin Stopping VMware USB Arbitrator
|
|
||||||
#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
killall --wait @@BINDIR@@/vmware-usbarbitrator
|
|
||||||
eend $?
|
|
||||||
@@BINDIR@@/vmware-networks --stop
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware services
|
|
||||||
modprobe -rv vsock vmmon vmblock vmnet
|
|
||||||
eend $?
|
|
||||||
modprobe -rv vmci || modprobe -rv vmw_vmci
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need localmount vmware
|
|
||||||
use net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
# Check if certificates exist. If not, we need to generate them, ala sshd.
|
|
||||||
if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
|
|
||||||
mkdir -p @@ETCDIR@@/ssl
|
|
||||||
openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
|
|
||||||
chmod -R 600 @@ETCDIR@@/ssl
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig
|
|
||||||
|
|
||||||
ebegin Starting VMware Authentication Daemon
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
ebegin Starting VMware Workstation Server
|
|
||||||
start-stop-daemon --start \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd \
|
|
||||||
-- -a -d @@ETCDIR@@/hostd/config.xml
|
|
||||||
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Shutdown VMs in the AutoStart Sequence"
|
|
||||||
local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "x" != "x${HOHO_ADMIN}" ]; then
|
|
||||||
@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
|
|
||||||
fi
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
ebegin Stopping VMware Workstation Server
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--pidfile /var/run/vmware/vmware-hostd.PID \
|
|
||||||
--exec @@BINDIR@@/vmware-hostd
|
|
||||||
eend $?
|
|
||||||
ebegin Stopping VMware Authentication Daemon
|
|
||||||
#start-stop-daemon --stop \
|
|
||||||
# --exec @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
killall @@PREFIX@@/sbin/vmware-authdlauncher
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,599 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
|
|
||||||
|
|
||||||
MY_PN="VMware-Workstation"
|
|
||||||
MY_PV=$(get_version_component_range 1-3)
|
|
||||||
PV_MODULES="308.$(get_version_component_range 2-3)"
|
|
||||||
PV_BUILD=$(get_version_component_range 4)
|
|
||||||
MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
|
|
||||||
|
|
||||||
SYSTEMD_UNITS_TAG="gentoo-02"
|
|
||||||
|
|
||||||
DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
|
|
||||||
HOMEPAGE="http://www.vmware.com/products/workstation/"
|
|
||||||
BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
|
|
||||||
SRC_URI="
|
|
||||||
amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
|
|
||||||
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
|
|
||||||
"
|
|
||||||
|
|
||||||
LICENSE="vmware GPL-2 GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
|
|
||||||
RESTRICT="mirror strip"
|
|
||||||
|
|
||||||
BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
|
|
||||||
|
|
||||||
BUNDLED_LIBS="
|
|
||||||
libXau.so.6
|
|
||||||
libXcomposite.so.1
|
|
||||||
libXcursor.so.1
|
|
||||||
libXdamage.so.1
|
|
||||||
libXdmcp.so.6
|
|
||||||
libXfixes.so.3
|
|
||||||
libXft.so.2
|
|
||||||
libXinerama.so.1
|
|
||||||
libXrandr.so.2
|
|
||||||
libXrender.so.1
|
|
||||||
libaio.so.1
|
|
||||||
libatk-1.0.so.0
|
|
||||||
libatkmm-1.6.so.1
|
|
||||||
libatspi.so.0
|
|
||||||
libcairo.so.2
|
|
||||||
libcairomm-1.0.so.1
|
|
||||||
libcrypto.so.1.0.1
|
|
||||||
libcurl.so.4
|
|
||||||
libdbus-1.so.3
|
|
||||||
libfontconfig.so.1
|
|
||||||
libfreetype.so.6
|
|
||||||
libfuse.so.2
|
|
||||||
libgailutil.so.18
|
|
||||||
libgcc_s.so.1
|
|
||||||
libgcrypt.so.11
|
|
||||||
libgdk-x11-2.0.so.0
|
|
||||||
libgdk_pixbuf-2.0.so.0
|
|
||||||
libgdkmm-2.4.so.1
|
|
||||||
libgio-2.0.so.0
|
|
||||||
libgiomm-2.4.so.1
|
|
||||||
libglib-2.0.so.0
|
|
||||||
libglibmm-2.4.so.1
|
|
||||||
libglibmm_generate_extra_defs-2.4.so.1
|
|
||||||
libgmodule-2.0.so.0
|
|
||||||
libgobject-2.0.so.0
|
|
||||||
libgpg-error.so.0
|
|
||||||
libgthread-2.0.so.0
|
|
||||||
libgtk-x11-2.0.so.0
|
|
||||||
libgtkmm-2.4.so.1
|
|
||||||
libpango-1.0.so.0
|
|
||||||
libpangocairo-1.0.so.0
|
|
||||||
libpangoft2-1.0.so.0
|
|
||||||
libpangomm-1.4.so.1
|
|
||||||
libpangox-1.0.so.0
|
|
||||||
libpangoxft-1.0.so.0
|
|
||||||
libpcsclite.so.1
|
|
||||||
libpixman-1.so.0
|
|
||||||
libpng12.so.0
|
|
||||||
librsvg-2.so.2
|
|
||||||
libsigc-2.0.so.0
|
|
||||||
libssl.so.1.0.1
|
|
||||||
libstdc++.so.6
|
|
||||||
libxml2.so.2
|
|
||||||
libz.so.1
|
|
||||||
"
|
|
||||||
|
|
||||||
BUNDLED_LIB_DEPENDS="
|
|
||||||
dev-cpp/atkmm
|
|
||||||
dev-cpp/cairomm
|
|
||||||
dev-cpp/glibmm:2
|
|
||||||
dev-cpp/gtkmm:2.4
|
|
||||||
dev-cpp/pangomm
|
|
||||||
dev-libs/atk
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/libgcrypt:11/11
|
|
||||||
dev-libs/libgpg-error
|
|
||||||
dev-libs/libsigc++:2
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-libs/openssl:0
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/freetype
|
|
||||||
media-libs/libpng:1.2
|
|
||||||
net-misc/curl
|
|
||||||
sys-fs/fuse
|
|
||||||
sys-libs/zlib
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gdk-pixbuf:2
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
x11-libs/libXau
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXdamage
|
|
||||||
x11-libs/libXfixes
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/pango
|
|
||||||
x11-libs/pixman
|
|
||||||
"
|
|
||||||
|
|
||||||
# vmware should not use virtual/libc as this is a
|
|
||||||
# precompiled binary package thats linked to glibc.
|
|
||||||
RDEPEND="
|
|
||||||
media-libs/alsa-lib
|
|
||||||
net-print/cups
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXinerama
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/startup-notification
|
|
||||||
x11-themes/hicolor-icon-theme
|
|
||||||
bundled-libs? (
|
|
||||||
media-libs/tiff:3
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
virtual/jpeg:62
|
|
||||||
)
|
|
||||||
!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
|
|
||||||
!app-emulation/vmware-player
|
|
||||||
"
|
|
||||||
PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
|
|
||||||
vmware-tools? ( app-emulation/vmware-tools )"
|
|
||||||
DEPEND=">=dev-util/patchelf-0.9"
|
|
||||||
|
|
||||||
S=${WORKDIR}
|
|
||||||
VM_INSTALL_DIR="/opt/vmware"
|
|
||||||
VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
|
|
||||||
VM_HOSTD_USER="root"
|
|
||||||
|
|
||||||
QA_PREBUILT="/opt/*"
|
|
||||||
|
|
||||||
QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
default
|
|
||||||
local bundle=${MY_P}.x86_64.bundle
|
|
||||||
|
|
||||||
local component; for component in \
|
|
||||||
vmware-workstation \
|
|
||||||
vmware-player-app \
|
|
||||||
vmware-player-setup \
|
|
||||||
vmware-vmx \
|
|
||||||
vmware-network-editor \
|
|
||||||
vmware-network-editor-ui \
|
|
||||||
vmware-usbarbitrator \
|
|
||||||
vmware-vprobe
|
|
||||||
do
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if use ovftool; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use vix; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_bundled_libs() {
|
|
||||||
if ! use bundled-libs ; then
|
|
||||||
einfo "Removing bundled libraries"
|
|
||||||
for libname in ${BUNDLED_LIBS} ; do
|
|
||||||
rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
|
|
||||||
done
|
|
||||||
|
|
||||||
rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
|
|
||||||
|
|
||||||
# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
|
|
||||||
# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
|
|
||||||
# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
|
|
||||||
# in libcds.so to be able to use system libs.
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching libcds.so"
|
|
||||||
cd "${S}"/lib/lib/libcds.so || die
|
|
||||||
patchelf --replace-needed libssl.so.1.0.{1,0} \
|
|
||||||
--replace-needed libcrypto.so.1.0.{1,0} \
|
|
||||||
libcds.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
|
|
||||||
# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
|
|
||||||
# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
|
|
||||||
# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
|
|
||||||
# preserve-libs mechanism to be triggered when a system lib is available (but not required)
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching libvmware-gksu.so"
|
|
||||||
cd "${S}"/lib/lib/libvmware-gksu.so || die
|
|
||||||
patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
|
|
||||||
libvmware-gksu.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
else
|
|
||||||
# if librsvg is not installed in the system then vmware doesn't start
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching svg_loader.so"
|
|
||||||
cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
|
|
||||||
patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
|
|
||||||
svg_loader.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
rm -f bin/vmware-modconfig
|
|
||||||
rm -rf lib/modules/binary
|
|
||||||
# Bug 459566
|
|
||||||
mv lib/libvmware-netcfg.so lib/lib/
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
|
|
||||||
fi
|
|
||||||
|
|
||||||
clean_bundled_libs
|
|
||||||
|
|
||||||
DOC_CONTENTS="
|
|
||||||
/etc/env.d is updated during ${PN} installation. Please run:\n
|
|
||||||
env-update && source /etc/profile\n
|
|
||||||
Before you can use ${PN}, you must configure a default network setup.
|
|
||||||
You can do this by running 'emerge --config ${PN}'.\n
|
|
||||||
To be able to run ${PN} your user must be in the vmware group.\n
|
|
||||||
You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
|
|
||||||
"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local major_minor=$(get_version_component_range 1-2 "${PV}")
|
|
||||||
|
|
||||||
# revdep-rebuild entry
|
|
||||||
insinto /etc/revdep-rebuild
|
|
||||||
echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
|
|
||||||
doins "${T}"/10${PN}
|
|
||||||
|
|
||||||
# install the binaries
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
# workaround for hardcoded search paths needed during shared objects loading
|
|
||||||
if ! use bundled-libs ; then
|
|
||||||
dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
|
|
||||||
# Bug 432918
|
|
||||||
dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
|
|
||||||
dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install the ancillaries
|
|
||||||
insinto /usr
|
|
||||||
doins -r share
|
|
||||||
|
|
||||||
if use cups; then
|
|
||||||
exeinto $(cups-config --serverbin)/filter
|
|
||||||
doexe extras/thnucups
|
|
||||||
|
|
||||||
insinto /etc/cups
|
|
||||||
doins -r etc/cups/*
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc doc/*
|
|
||||||
fi
|
|
||||||
|
|
||||||
exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
|
|
||||||
doexe vmware-config
|
|
||||||
|
|
||||||
# install vmware workstation server
|
|
||||||
if use server; then
|
|
||||||
dosbin sbin/*
|
|
||||||
|
|
||||||
cd "${S}"/vmware-workstation-server
|
|
||||||
|
|
||||||
# install binaries
|
|
||||||
into "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
dobin "${FILESDIR}"/configure-hostd.sh
|
|
||||||
|
|
||||||
dobin "${FILESDIR}"/configure-hostd.sh
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
for tool in vmware-hostd wssc-adminTool ; do
|
|
||||||
cat > "${T}/${tool}" <<-EOF
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
. /etc/vmware/bootstrap
|
|
||||||
|
|
||||||
exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/lib" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
|
|
||||||
EOF
|
|
||||||
dobin "${T}/${tool}"
|
|
||||||
done
|
|
||||||
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
doins -r hostd
|
|
||||||
|
|
||||||
# create the configuration
|
|
||||||
insinto /etc/vmware/hostd
|
|
||||||
doins -r config/etc/vmware/hostd/*
|
|
||||||
doins -r etc/vmware/hostd/*
|
|
||||||
|
|
||||||
insinto /etc/vmware/ssl
|
|
||||||
doins etc/vmware/ssl/*
|
|
||||||
|
|
||||||
# pam
|
|
||||||
pamd_mimic_system vmware-authd auth account
|
|
||||||
|
|
||||||
# create directory for shared virtual machines.
|
|
||||||
keepdir "${VM_DATA_STORE_DIR}"
|
|
||||||
keepdir /var/log/vmware
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install vmware-vix
|
|
||||||
if use vix; then
|
|
||||||
cd "${S}"/vmware-vix
|
|
||||||
|
|
||||||
# install the binary
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
|
|
||||||
|
|
||||||
# install headers
|
|
||||||
insinto /usr/include/vmware-vix
|
|
||||||
doins include/*
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dohtml -r doc/*
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install ovftool
|
|
||||||
if use ovftool; then
|
|
||||||
cd "${S}"
|
|
||||||
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
|
|
||||||
doins -r vmware-ovftool/*
|
|
||||||
|
|
||||||
chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
|
|
||||||
dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create symlinks for the various tools
|
|
||||||
local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
|
|
||||||
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do
|
|
||||||
dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
|
|
||||||
done
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
|
|
||||||
|
|
||||||
# fix permissions
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
|
|
||||||
if use server; then
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
|
|
||||||
fperms 1777 "${VM_DATA_STORE_DIR}"
|
|
||||||
fi
|
|
||||||
if use vix; then
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create the environment
|
|
||||||
local envd="${T}/90vmware"
|
|
||||||
cat > "${envd}" <<-EOF
|
|
||||||
PATH='${VM_INSTALL_DIR}/bin'
|
|
||||||
ROOTPATH='${VM_INSTALL_DIR}/bin'
|
|
||||||
EOF
|
|
||||||
use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
|
|
||||||
|
|
||||||
doenvd "${envd}"
|
|
||||||
|
|
||||||
# create the configuration
|
|
||||||
dodir /etc/vmware
|
|
||||||
|
|
||||||
cat > "${D}"/etc/vmware/bootstrap <<-EOF
|
|
||||||
BINDIR='${VM_INSTALL_DIR}/bin'
|
|
||||||
LIBDIR='${VM_INSTALL_DIR}/lib'
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "${D}"/etc/vmware/config <<-EOF
|
|
||||||
bindir = "${VM_INSTALL_DIR}/bin"
|
|
||||||
libdir = "${VM_INSTALL_DIR}/lib/vmware"
|
|
||||||
initscriptdir = "/etc/init.d"
|
|
||||||
authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
|
|
||||||
gksu.rootMethod = "su"
|
|
||||||
VMCI_CONFED = "yes"
|
|
||||||
VMBLOCK_CONFED = "yes"
|
|
||||||
VSOCK_CONFED = "yes"
|
|
||||||
NETWORKING = "yes"
|
|
||||||
player.product.version = "${MY_PV}"
|
|
||||||
product.buildNumber = "${PV_BUILD}"
|
|
||||||
product.version = "${MY_PV}"
|
|
||||||
product.name = "VMware Workstation"
|
|
||||||
workstation.product.version = "${MY_PV}"
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if use vix; then
|
|
||||||
cat >> "${D}"/etc/vmware/config <<-EOF
|
|
||||||
vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
|
|
||||||
vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
|
|
||||||
vix.config.version = "1"
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
cat >> "${D}"/etc/vmware/config <<-EOF
|
|
||||||
authd.client.port = "902"
|
|
||||||
authd.proxy.nfc = "vmware-hostd:ha-nfc"
|
|
||||||
authd.soapserver = "TRUE"
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install the init.d script
|
|
||||||
local initscript="${T}/vmware.rc"
|
|
||||||
sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
|
||||||
"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
|
|
||||||
newinitd "${initscript}" vmware
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
# install the init.d script
|
|
||||||
local initscript="${T}/vmware-workstation-server.rc"
|
|
||||||
sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
|
|
||||||
-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
|
|
||||||
-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
|
||||||
-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
|
|
||||||
"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
|
|
||||||
newinitd "${initscript}" vmware-workstation-server
|
|
||||||
fi
|
|
||||||
|
|
||||||
# fill in variable placeholders
|
|
||||||
if use bundled-libs ; then
|
|
||||||
sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
|
|
||||||
-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
|
|
||||||
fi
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-player.desktop" || die
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-workstation.desktop" || die
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
# Configuration for vmware-workstation-server
|
|
||||||
local hostdUser="${VM_HOSTD_USER:-root}"
|
|
||||||
sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/authorization.xml" || die
|
|
||||||
|
|
||||||
# Shared VMs Path: [standard].
|
|
||||||
sed -e "s:##{DS_NAME}##:standard:g" \
|
|
||||||
-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/datastores.xml" || die
|
|
||||||
|
|
||||||
sed -e "s:##{HTTP_PORT}##:-1:g" \
|
|
||||||
-e "s:##{HTTPS_PORT}##:443:g" \
|
|
||||||
-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/proxy.xml" || die
|
|
||||||
|
|
||||||
# See vmware-workstation-server.py for more details.
|
|
||||||
sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{CFGDIR}##:/etc/vmware/:g" \
|
|
||||||
-e "s:##{ENABLE_AUTH}##:true:g" \
|
|
||||||
-e "s:##{HOSTDMODE}##:ws:g" \
|
|
||||||
-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{HOSTD_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
|
|
||||||
-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
|
|
||||||
-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
|
|
||||||
-e "s:##{LOGLEVEL}##:verbose:g" \
|
|
||||||
-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
|
|
||||||
-e "s:##{PLUGINDIR}##:./:g" \
|
|
||||||
-e "s:##{SHLIB_PREFIX}##:lib:g" \
|
|
||||||
-e "s:##{SHLIB_SUFFIX}##:.so:g" \
|
|
||||||
-e "s:##{USE_BLKLISTSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_CBRCSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_CIMSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_DIRECTORYSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNAMO}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_GUESTSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HBRSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_HTTPNFCSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_NFCSVC}##:true:g" \
|
|
||||||
-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_OVFMGRSVC}##:true:g" \
|
|
||||||
-e "s:##{USE_PARTITIONSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_SECURESOAP}##:false:g" \
|
|
||||||
-e "s:##{USE_SNMPSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VDISKSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
|
|
||||||
-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
|
|
||||||
-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
|
|
||||||
-e "s:##{WORKINGDIR}##:./:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/config.xml" || die
|
|
||||||
|
|
||||||
sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/environments.xml" || die
|
|
||||||
|
|
||||||
# @@VICLIENT_URL@@=XXX
|
|
||||||
sed -e "s:@@AUTHD_PORT@@:902:g" \
|
|
||||||
-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install systemd unit files
|
|
||||||
systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
|
|
||||||
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_config() {
|
|
||||||
"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_icon_savelist
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
fdo-mime_desktop_database_update
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
|
|
||||||
ewarn "${P} is using an old version of libgcrypt library which"
|
|
||||||
ewarn "is going to be soon removed from portage due to security reasons"
|
|
||||||
ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
|
|
||||||
ewarn "Until vmware is fixed upstream you're exposed to security issues!"
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_prerm() {
|
|
||||||
einfo "Stopping ${PN} for safe unmerge"
|
|
||||||
/etc/init.d/vmware stop
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
fdo-mime_desktop_database_update
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
}
|
|
@ -1,605 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
|
|
||||||
|
|
||||||
MY_PN="VMware-Workstation"
|
|
||||||
MY_PV=$(get_version_component_range 1-3)
|
|
||||||
PV_MODULES="308.$(get_version_component_range 2-3)"
|
|
||||||
PV_BUILD=$(get_version_component_range 4)
|
|
||||||
MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
|
|
||||||
|
|
||||||
SYSTEMD_UNITS_TAG="gentoo-02"
|
|
||||||
|
|
||||||
DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
|
|
||||||
HOMEPAGE="http://www.vmware.com/products/workstation/"
|
|
||||||
BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
|
|
||||||
SRC_URI="
|
|
||||||
amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
|
|
||||||
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
|
|
||||||
"
|
|
||||||
|
|
||||||
LICENSE="vmware GPL-2 GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
|
|
||||||
RESTRICT="mirror strip"
|
|
||||||
|
|
||||||
BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
|
|
||||||
|
|
||||||
BUNDLED_LIBS="
|
|
||||||
libXau.so.6
|
|
||||||
libXcomposite.so.1
|
|
||||||
libXcursor.so.1
|
|
||||||
libXdamage.so.1
|
|
||||||
libXdmcp.so.6
|
|
||||||
libXfixes.so.3
|
|
||||||
libXft.so.2
|
|
||||||
libXinerama.so.1
|
|
||||||
libXrandr.so.2
|
|
||||||
libXrender.so.1
|
|
||||||
libaio.so.1
|
|
||||||
libatk-1.0.so.0
|
|
||||||
libatkmm-1.6.so.1
|
|
||||||
libatspi.so.0
|
|
||||||
libcairo.so.2
|
|
||||||
libcairomm-1.0.so.1
|
|
||||||
libcrypto.so.1.0.1
|
|
||||||
libcurl.so.4
|
|
||||||
libdbus-1.so.3
|
|
||||||
libfontconfig.so.1
|
|
||||||
libfreetype.so.6
|
|
||||||
libfuse.so.2
|
|
||||||
libgailutil.so.18
|
|
||||||
libgcc_s.so.1
|
|
||||||
libgcrypt.so.11
|
|
||||||
libgdk-x11-2.0.so.0
|
|
||||||
libgdk_pixbuf-2.0.so.0
|
|
||||||
libgdkmm-2.4.so.1
|
|
||||||
libgio-2.0.so.0
|
|
||||||
libgiomm-2.4.so.1
|
|
||||||
libglib-2.0.so.0
|
|
||||||
libglibmm-2.4.so.1
|
|
||||||
libglibmm_generate_extra_defs-2.4.so.1
|
|
||||||
libgmodule-2.0.so.0
|
|
||||||
libgobject-2.0.so.0
|
|
||||||
libgpg-error.so.0
|
|
||||||
libgthread-2.0.so.0
|
|
||||||
libgtk-x11-2.0.so.0
|
|
||||||
libgtkmm-2.4.so.1
|
|
||||||
libpango-1.0.so.0
|
|
||||||
libpangocairo-1.0.so.0
|
|
||||||
libpangoft2-1.0.so.0
|
|
||||||
libpangomm-1.4.so.1
|
|
||||||
libpangox-1.0.so.0
|
|
||||||
libpangoxft-1.0.so.0
|
|
||||||
libpcsclite.so.1
|
|
||||||
libpixman-1.so.0
|
|
||||||
libpng12.so.0
|
|
||||||
librsvg-2.so.2
|
|
||||||
libsigc-2.0.so.0
|
|
||||||
libssl.so.1.0.1
|
|
||||||
libstdc++.so.6
|
|
||||||
libxml2.so.2
|
|
||||||
"
|
|
||||||
|
|
||||||
BUNDLED_LIB_DEPENDS="
|
|
||||||
dev-cpp/atkmm
|
|
||||||
dev-cpp/cairomm
|
|
||||||
dev-cpp/glibmm:2
|
|
||||||
dev-cpp/gtkmm:2.4
|
|
||||||
dev-cpp/pangomm
|
|
||||||
dev-libs/atk
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/libgcrypt:11/11
|
|
||||||
dev-libs/libgpg-error
|
|
||||||
dev-libs/libsigc++:2
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-libs/openssl:0
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/freetype
|
|
||||||
media-libs/libpng:1.2
|
|
||||||
net-misc/curl
|
|
||||||
sys-fs/fuse
|
|
||||||
sys-libs/zlib
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gdk-pixbuf:2
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
x11-libs/libXau
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXdamage
|
|
||||||
x11-libs/libXfixes
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/pango
|
|
||||||
x11-libs/pixman
|
|
||||||
"
|
|
||||||
|
|
||||||
# vmware should not use virtual/libc as this is a
|
|
||||||
# precompiled binary package thats linked to glibc.
|
|
||||||
RDEPEND="
|
|
||||||
media-libs/alsa-lib
|
|
||||||
net-print/cups
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXinerama
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/startup-notification
|
|
||||||
x11-themes/hicolor-icon-theme
|
|
||||||
bundled-libs? (
|
|
||||||
media-libs/tiff:3
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
virtual/jpeg:62
|
|
||||||
)
|
|
||||||
!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
|
|
||||||
!app-emulation/vmware-player
|
|
||||||
"
|
|
||||||
PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
|
|
||||||
vmware-tools? ( app-emulation/vmware-tools )"
|
|
||||||
DEPEND=">=dev-util/patchelf-0.9"
|
|
||||||
|
|
||||||
S=${WORKDIR}
|
|
||||||
VM_INSTALL_DIR="/opt/vmware"
|
|
||||||
VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
|
|
||||||
VM_HOSTD_USER="root"
|
|
||||||
|
|
||||||
QA_PREBUILT="/opt/*"
|
|
||||||
|
|
||||||
QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
default
|
|
||||||
local bundle=${MY_P}.x86_64.bundle
|
|
||||||
|
|
||||||
local component; for component in \
|
|
||||||
vmware-workstation \
|
|
||||||
vmware-player-app \
|
|
||||||
vmware-player-setup \
|
|
||||||
vmware-vmx \
|
|
||||||
vmware-network-editor \
|
|
||||||
vmware-network-editor-ui \
|
|
||||||
vmware-usbarbitrator \
|
|
||||||
vmware-vprobe
|
|
||||||
do
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if use ovftool; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use vix; then
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
|
|
||||||
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_bundled_libs() {
|
|
||||||
if ! use bundled-libs ; then
|
|
||||||
einfo "Removing bundled libraries"
|
|
||||||
for libname in ${BUNDLED_LIBS} ; do
|
|
||||||
rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
|
|
||||||
done
|
|
||||||
|
|
||||||
rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
|
|
||||||
|
|
||||||
# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
|
|
||||||
# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
|
|
||||||
# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
|
|
||||||
# in libcds.so to be able to use system libs.
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching libcds.so"
|
|
||||||
cd "${S}"/lib/lib/libcds.so || die
|
|
||||||
patchelf --replace-needed libssl.so.1.0.{1,0} \
|
|
||||||
--replace-needed libcrypto.so.1.0.{1,0} \
|
|
||||||
libcds.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
|
|
||||||
# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
|
|
||||||
# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
|
|
||||||
# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
|
|
||||||
# preserve-libs mechanism to be triggered when a system lib is available (but not required)
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching libvmware-gksu.so"
|
|
||||||
cd "${S}"/lib/lib/libvmware-gksu.so || die
|
|
||||||
patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
|
|
||||||
libvmware-gksu.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
else
|
|
||||||
# if librsvg is not installed in the system then vmware doesn't start
|
|
||||||
pushd >/dev/null .
|
|
||||||
einfo "Patching svg_loader.so"
|
|
||||||
cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
|
|
||||||
patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
|
|
||||||
svg_loader.so || die
|
|
||||||
popd >/dev/null
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
rm -f bin/vmware-modconfig
|
|
||||||
rm -rf lib/modules/binary
|
|
||||||
# Bug 459566
|
|
||||||
mv lib/libvmware-netcfg.so lib/lib/
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
|
|
||||||
fi
|
|
||||||
|
|
||||||
clean_bundled_libs
|
|
||||||
|
|
||||||
DOC_CONTENTS="
|
|
||||||
/etc/env.d is updated during ${PN} installation. Please run:\n
|
|
||||||
env-update && source /etc/profile\n
|
|
||||||
Before you can use ${PN}, you must configure a default network setup.
|
|
||||||
You can do this by running 'emerge --config ${PN}'.\n
|
|
||||||
To be able to run ${PN} your user must be in the vmware group.\n
|
|
||||||
You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
|
|
||||||
"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local major_minor=$(get_version_component_range 1-2 "${PV}")
|
|
||||||
|
|
||||||
# revdep-rebuild entry
|
|
||||||
insinto /etc/revdep-rebuild
|
|
||||||
echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
|
|
||||||
doins "${T}"/10${PN}
|
|
||||||
|
|
||||||
# install the binaries
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
# workaround for hardcoded search paths needed during shared objects loading
|
|
||||||
if ! use bundled-libs ; then
|
|
||||||
dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
|
|
||||||
# Bug 432918
|
|
||||||
dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
|
|
||||||
dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# bug 616958
|
|
||||||
# system libs don't work anymore with embedeed zlib because it doesn't support ZLIB_1.2.9,
|
|
||||||
# add this hack to bypass embedded zlib which is always loaded and required during startup
|
|
||||||
# of vmware since 12.5.x
|
|
||||||
dosym /$(get_libdir)/libz.so.1 \
|
|
||||||
"${VM_INSTALL_DIR}"/lib/vmware/lib/libz.so.1/libz.so.1
|
|
||||||
|
|
||||||
# install the ancillaries
|
|
||||||
insinto /usr
|
|
||||||
doins -r share
|
|
||||||
|
|
||||||
if use cups; then
|
|
||||||
exeinto $(cups-config --serverbin)/filter
|
|
||||||
doexe extras/thnucups
|
|
||||||
|
|
||||||
insinto /etc/cups
|
|
||||||
doins -r etc/cups/*
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc doc/*
|
|
||||||
fi
|
|
||||||
|
|
||||||
exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
|
|
||||||
doexe vmware-config
|
|
||||||
|
|
||||||
# install vmware workstation server
|
|
||||||
if use server; then
|
|
||||||
dosbin sbin/*
|
|
||||||
|
|
||||||
cd "${S}"/vmware-workstation-server
|
|
||||||
|
|
||||||
# install binaries
|
|
||||||
into "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
dobin "${FILESDIR}"/configure-hostd.sh
|
|
||||||
|
|
||||||
dobin "${FILESDIR}"/configure-hostd.sh
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
for tool in vmware-hostd wssc-adminTool ; do
|
|
||||||
cat > "${T}/${tool}" <<-EOF
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
. /etc/vmware/bootstrap
|
|
||||||
|
|
||||||
exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/lib" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
|
|
||||||
"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
|
|
||||||
EOF
|
|
||||||
dobin "${T}/${tool}"
|
|
||||||
done
|
|
||||||
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
|
||||||
doins -r hostd
|
|
||||||
|
|
||||||
# create the configuration
|
|
||||||
insinto /etc/vmware/hostd
|
|
||||||
doins -r config/etc/vmware/hostd/*
|
|
||||||
doins -r etc/vmware/hostd/*
|
|
||||||
|
|
||||||
insinto /etc/vmware/ssl
|
|
||||||
doins etc/vmware/ssl/*
|
|
||||||
|
|
||||||
# pam
|
|
||||||
pamd_mimic_system vmware-authd auth account
|
|
||||||
|
|
||||||
# create directory for shared virtual machines.
|
|
||||||
keepdir "${VM_DATA_STORE_DIR}"
|
|
||||||
keepdir /var/log/vmware
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install vmware-vix
|
|
||||||
if use vix; then
|
|
||||||
cd "${S}"/vmware-vix
|
|
||||||
|
|
||||||
# install the binary
|
|
||||||
into "${VM_INSTALL_DIR}"
|
|
||||||
dobin bin/*
|
|
||||||
|
|
||||||
# install the libraries
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
|
|
||||||
doins -r lib/*
|
|
||||||
|
|
||||||
dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
|
|
||||||
|
|
||||||
# install headers
|
|
||||||
insinto /usr/include/vmware-vix
|
|
||||||
doins include/*
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dohtml -r doc/*
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install ovftool
|
|
||||||
if use ovftool; then
|
|
||||||
cd "${S}"
|
|
||||||
|
|
||||||
insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
|
|
||||||
doins -r vmware-ovftool/*
|
|
||||||
|
|
||||||
chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
|
|
||||||
dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create symlinks for the various tools
|
|
||||||
local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
|
|
||||||
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do
|
|
||||||
dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
|
|
||||||
done
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
|
|
||||||
dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
|
|
||||||
|
|
||||||
# fix permissions
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
|
|
||||||
if use server; then
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
|
|
||||||
fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
|
|
||||||
fperms 1777 "${VM_DATA_STORE_DIR}"
|
|
||||||
fi
|
|
||||||
if use vix; then
|
|
||||||
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create the environment
|
|
||||||
local envd="${T}/90vmware"
|
|
||||||
cat > "${envd}" <<-EOF
|
|
||||||
PATH='${VM_INSTALL_DIR}/bin'
|
|
||||||
ROOTPATH='${VM_INSTALL_DIR}/bin'
|
|
||||||
EOF
|
|
||||||
use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
|
|
||||||
|
|
||||||
doenvd "${envd}"
|
|
||||||
|
|
||||||
# create the configuration
|
|
||||||
dodir /etc/vmware
|
|
||||||
|
|
||||||
cat > "${D}"/etc/vmware/bootstrap <<-EOF
|
|
||||||
BINDIR='${VM_INSTALL_DIR}/bin'
|
|
||||||
LIBDIR='${VM_INSTALL_DIR}/lib'
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "${D}"/etc/vmware/config <<-EOF
|
|
||||||
bindir = "${VM_INSTALL_DIR}/bin"
|
|
||||||
libdir = "${VM_INSTALL_DIR}/lib/vmware"
|
|
||||||
initscriptdir = "/etc/init.d"
|
|
||||||
authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
|
|
||||||
gksu.rootMethod = "su"
|
|
||||||
VMCI_CONFED = "yes"
|
|
||||||
VMBLOCK_CONFED = "yes"
|
|
||||||
VSOCK_CONFED = "yes"
|
|
||||||
NETWORKING = "yes"
|
|
||||||
player.product.version = "${MY_PV}"
|
|
||||||
product.buildNumber = "${PV_BUILD}"
|
|
||||||
product.version = "${MY_PV}"
|
|
||||||
product.name = "VMware Workstation"
|
|
||||||
workstation.product.version = "${MY_PV}"
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if use vix; then
|
|
||||||
cat >> "${D}"/etc/vmware/config <<-EOF
|
|
||||||
vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
|
|
||||||
vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
|
|
||||||
vix.config.version = "1"
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
cat >> "${D}"/etc/vmware/config <<-EOF
|
|
||||||
authd.client.port = "902"
|
|
||||||
authd.proxy.nfc = "vmware-hostd:ha-nfc"
|
|
||||||
authd.soapserver = "TRUE"
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install the init.d script
|
|
||||||
local initscript="${T}/vmware.rc"
|
|
||||||
sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
|
||||||
"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
|
|
||||||
newinitd "${initscript}" vmware
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
# install the init.d script
|
|
||||||
local initscript="${T}/vmware-workstation-server.rc"
|
|
||||||
sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
|
|
||||||
-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
|
|
||||||
-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
|
||||||
-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
|
|
||||||
"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
|
|
||||||
newinitd "${initscript}" vmware-workstation-server
|
|
||||||
fi
|
|
||||||
|
|
||||||
# fill in variable placeholders
|
|
||||||
if use bundled-libs ; then
|
|
||||||
sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
|
|
||||||
-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
|
|
||||||
fi
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-player.desktop" || die
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-workstation.desktop" || die
|
|
||||||
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
|
|
||||||
-e "/^Encoding/d" \
|
|
||||||
-i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
|
|
||||||
|
|
||||||
if use server; then
|
|
||||||
# Configuration for vmware-workstation-server
|
|
||||||
local hostdUser="${VM_HOSTD_USER:-root}"
|
|
||||||
sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/authorization.xml" || die
|
|
||||||
|
|
||||||
# Shared VMs Path: [standard].
|
|
||||||
sed -e "s:##{DS_NAME}##:standard:g" \
|
|
||||||
-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/datastores.xml" || die
|
|
||||||
|
|
||||||
sed -e "s:##{HTTP_PORT}##:-1:g" \
|
|
||||||
-e "s:##{HTTPS_PORT}##:443:g" \
|
|
||||||
-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/proxy.xml" || die
|
|
||||||
|
|
||||||
# See vmware-workstation-server.py for more details.
|
|
||||||
sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{CFGDIR}##:/etc/vmware/:g" \
|
|
||||||
-e "s:##{ENABLE_AUTH}##:true:g" \
|
|
||||||
-e "s:##{HOSTDMODE}##:ws:g" \
|
|
||||||
-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
|
||||||
-e "s:##{HOSTD_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
|
|
||||||
-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
|
|
||||||
-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
|
|
||||||
-e "s:##{LOGLEVEL}##:verbose:g" \
|
|
||||||
-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
|
|
||||||
-e "s:##{PLUGINDIR}##:./:g" \
|
|
||||||
-e "s:##{SHLIB_PREFIX}##:lib:g" \
|
|
||||||
-e "s:##{SHLIB_SUFFIX}##:.so:g" \
|
|
||||||
-e "s:##{USE_BLKLISTSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_CBRCSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_CIMSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_DIRECTORYSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNAMO}##:false:g" \
|
|
||||||
-e "s:##{USE_DYNSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_GUESTSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HBRSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_HTTPNFCSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_NFCSVC}##:true:g" \
|
|
||||||
-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_OVFMGRSVC}##:true:g" \
|
|
||||||
-e "s:##{USE_PARTITIONSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_SECURESOAP}##:false:g" \
|
|
||||||
-e "s:##{USE_SNMPSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VDISKSVC}##:false:g" \
|
|
||||||
-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
|
|
||||||
-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
|
|
||||||
-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
|
|
||||||
-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
|
|
||||||
-e "s:##{WORKINGDIR}##:./:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/config.xml" || die
|
|
||||||
|
|
||||||
sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
|
|
||||||
-i "${D}/etc/vmware/hostd/environments.xml" || die
|
|
||||||
|
|
||||||
# @@VICLIENT_URL@@=XXX
|
|
||||||
sed -e "s:@@AUTHD_PORT@@:902:g" \
|
|
||||||
-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install systemd unit files
|
|
||||||
systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
|
|
||||||
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_config() {
|
|
||||||
"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_icon_savelist
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
fdo-mime_desktop_database_update
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
|
|
||||||
ewarn "${P} is using an old version of libgcrypt library which"
|
|
||||||
ewarn "is going to be soon removed from portage due to security reasons"
|
|
||||||
ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
|
|
||||||
ewarn "Until vmware is fixed upstream you're exposed to security issues!"
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_prerm() {
|
|
||||||
einfo "Stopping ${PN} for safe unmerge"
|
|
||||||
/etc/init.d/vmware stop
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
fdo-mime_desktop_database_update
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
}
|
|
Loading…
Reference in new issue