diff options
author | Mike Auty <ikelos@gentoo.org> | 2009-05-16 07:33:21 +0000 |
---|---|---|
committer | Mike Auty <ikelos@gentoo.org> | 2009-05-16 07:33:21 +0000 |
commit | bc9232125e7be8706988d4e1c065d63cc03d2303 (patch) | |
tree | f7d90c38dbac87dc19825355a7527e0768c96f8f /app-emulation/vmware-modules | |
parent | Migration to virtual/libusb. Verified by code inspection. (diff) | |
download | historical-bc9232125e7be8706988d4e1c065d63cc03d2303.tar.gz historical-bc9232125e7be8706988d4e1c065d63cc03d2303.tar.bz2 historical-bc9232125e7be8706988d4e1c065d63cc03d2303.zip |
Version bump vmware-modules for 2.6.29 support.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'app-emulation/vmware-modules')
-rw-r--r-- | app-emulation/vmware-modules/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/vmware-modules/Manifest | 14 | ||||
-rw-r--r-- | app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch | 288 | ||||
-rw-r--r-- | app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild | 25 |
4 files changed, 330 insertions, 6 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index fb9722e50ae2..6ddd8f4f69ae 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.42 2009/02/22 23:25:40 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.43 2009/05/16 07:33:20 ikelos Exp $ + +*vmware-modules-1.0.0.23-r1 (16 May 2009) + + 16 May 2009; Mike Auty <ikelos@gentoo.org> + +vmware-modules-1.0.0.23-r1.ebuild, + +files/1.0.0.23-r1-kernel-2.6.29.patch: + Version bump vmware-modules for 2.6.29 support. 22 Feb 2009; Mike Auty <ikelos@gentoo.org> -files/1.0.0.20-vmblock-2.6.26-2.patch, diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index f672056c16cd..7573b9821878 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -2,6 +2,7 @@ Hash: SHA1 AUX 1.0.0.23-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f +AUX 1.0.0.23-r1-kernel-2.6.29.patch 10451 RMD160 2f0094a87ae9530e6a5937f6b3dc3bdeeebe2370 SHA1 86d4f265ecb7921dae4a5cf6531c85f5c4dde82e SHA256 c1f0467f9326f39fbfe81027f26fac478eeb5136f0c06c102e4d3b029971d021 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e @@ -12,17 +13,20 @@ AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17 AUX patches/vmnet/030_all_kernel-2.6.27.patch 2558 RMD160 9ba251de06852c33e4530628679bdf36ea8051bd SHA1 0078be861f34d4b8def9fcf38385e8c335cbc909 SHA256 b4bc5e5c1030bd5341ef60500dece1d0b6b1f4e553cb566c1ba5506ed6dbb03f DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 +DIST vmware-modules-1.0.0.23-r1.amd64.tar.bz2 486989 RMD160 12f197294b4df7bf15935ef9d44d7c809a5d88aa SHA1 51436cfd97311eb5d1430b390d2d98a27bf47494 SHA256 b062c7505e0251ce5352c40d081a62989e6fa5f6441b737bbeb6c4471867686e +DIST vmware-modules-1.0.0.23-r1.x86.tar.bz2 487101 RMD160 f69475312cbaeb0afccc46e8465dfbed7bee49d2 SHA1 f2b23a2adcfc8fde3cd26f1a75e504c82010bb10 SHA256 5fb5eb11d26e86a62018a57e6afe975f32ce9a7b0ec1069ed1f756e034337b6b DIST vmware-modules-1.0.0.23.amd64.tar.bz2 489196 RMD160 5ef5d18ec22129cd4563d14ed8b213fdd3ad86ec SHA1 64a2fb7b1195d3ee773b9e49fe8dc9b5d7ffc43a SHA256 7d8028b9da2ad1694a6e71f1f6b1f63a9a03e78249f4cacdfccd1ea508e07d2a DIST vmware-modules-1.0.0.23.x86.tar.bz2 486085 RMD160 d039206f0ed3fcd93f7acf3bc24c340b8641057a SHA1 5a4e9ed931f6592c8332239e424afdd80b1b46e5 SHA256 5780292e519da9e1512bf78b1e0e6c21e44f4e10f214dcc0caf83af482dedf68 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d +EBUILD vmware-modules-1.0.0.23-r1.ebuild 817 RMD160 e126704918b1c106185e7743006c8178a156620c SHA1 8aa89f0e4a772fa59e05b7a158817ccf84aba54d SHA256 c846170c19b8525ebcdbd01a3c0d9e0bad2ff02b8129475814c65c3f8403d711 EBUILD vmware-modules-1.0.0.23.ebuild 724 RMD160 35c62995060e0c709dbd690ef63c48a431dfae8a SHA1 6ea6e450fd540c772f5c7227056848f8513939c2 SHA256 a132d0c74e914ff65e0cef0bdbe54e4e9e05e59ad7d1dc72e404d568bd0e31f4 -MISC ChangeLog 9883 RMD160 c7dbc722186ea874bf97c35e2d1cc8b7f934e565 SHA1 0f806ac1335cb317e8eac7ee6a1423b5b771ebf9 SHA256 49d6a7e34d362a378716657768caae759f123ae760a24067ad8911dc447dccf4 +MISC ChangeLog 10102 RMD160 7fdae32d2bdb877ee93d6ccb952ceca05728ab33 SHA1 9809b418ff0218e0aecbfd483d55e3f66d6ef4dd SHA256 40f7ed64b52cd65412524be2c6e8ee1fe153d0fb8bb12b167ca5160a4123a2fe MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkmh3vwACgkQu7rWomwgFXq0ngCgsOigyNCeTeF4MPgbNnwdso1m -9b4AoK8MFS7rpcB/af8BtokGPZoKeE7u -=+MJ6 +iEYEARECAAYFAkoObE0ACgkQu7rWomwgFXqiMwCgmOeQPsMkR+opBygDe30t15Kf +jAAAn3oU3e+WamvCfYTasPlmLOqb2Jwt +=gHBA -----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch b/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch new file mode 100644 index 000000000000..a4ad6e9ae5f6 --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch @@ -0,0 +1,288 @@ +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel +--- vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel 2009-03-27 08:05:21.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 +@@ -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, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel +--- vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel 2009-03-27 08:05:22.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 +@@ -21,7 +21,7 @@ + + INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) + +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c +--- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c 2009-03-27 08:05:19.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c 2009-04-07 16:15:11.000000000 +0400 +@@ -1984,10 +1984,10 @@ + } + + case IOCTL_VMX86_ALLOW_CORE_DUMP: +- if (current->euid == current->uid && +- current->fsuid == current->uid && +- current->egid == current->gid && +- current->fsgid == current->gid) { ++ if (current_euid() == current_uid() && ++ current_fsuid() == current_uid() && ++ current_egid() == current_gid() && ++ current_fsgid() == current_gid()) { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) || defined(MMF_DUMPABLE) + /* Dump core, readable by user. */ + set_bit(MMF_DUMPABLE, ¤t->mm->flags); +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c +--- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c 2009-03-27 08:05:18.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c 2009-04-07 16:19:05.000000000 +0400 +@@ -3424,6 +3424,82 @@ + } + + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++static inline ++void compat_cap_raise(int cap) ++{ ++ cap_raise(current->cap_effective, cap); ++} ++#else ++static ++void compat_cap_raise(int cap) ++{ ++ struct cred *new_cred; ++ ++ new_cred = prepare_creds(); ++ if (new_cred != NULL) ++ { ++ cap_raise(new_cred->cap_effective, cap); ++ commit_creds(new_cred); ++ } ++ else ++ { ++ Log("compat_cap_raise(%d) prepare_creds(): Out of memory\n", cap); ++ } ++} ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++static inline ++void compat_cap_lower(int cap) ++{ ++ cap_lower(current->cap_effective, cap); ++} ++#else ++static ++void compat_cap_lower(int cap) ++{ ++ struct cred *new_cred; ++ ++ new_cred = prepare_creds(); ++ if (new_cred != NULL) ++ { ++ cap_lower(new_cred->cap_effective, cap); ++ commit_creds(new_cred); ++ } ++ else ++ { ++ Log("compat_cap_lower(%d) prepare_creds(): Out of memory\n", cap); ++ } ++} ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++static inline ++void compat_set_fsuid(int fsuid) ++{ ++ current->fsuid = fsuid; ++} ++#else ++static ++void compat_set_fsuid(int fsuid) ++{ ++ struct cred *new_cred; ++ ++ new_cred = prepare_creds(); ++ if (new_cred != NULL) ++ { ++ new_cred->fsuid = fsuid; ++ commit_creds(new_cred); ++ } ++ else ++ { ++ Log("compat_set_fsuid(%d) prepare_creds(): Out of memory\n", fsuid); ++ } ++} ++#endif ++ ++ + /* + *---------------------------------------------------------------------- + * +@@ -3456,7 +3532,7 @@ + oldFS = get_fs(); + set_fs(KERNEL_DS); + compat_allow_signal(SIGKILL); +- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); ++ compat_cap_raise(CAP_SYS_RESOURCE); + compat_set_user_nice(current, linuxState.fastClockPriority); + + while (linuxState.fastClockRate > HZ + HZ/16) { +@@ -3580,19 +3656,19 @@ + Bool cap; + long pid; + +- fsuid = current->fsuid; +- current->fsuid = 0; ++ fsuid = current_fsuid(); ++ compat_set_fsuid(0); + filp = filp_open("/dev/rtc", O_RDONLY, 0); +- current->fsuid = fsuid; ++ compat_set_fsuid(fsuid); + if (IS_ERR(filp)) { + Warning("/dev/rtc open failed: %d\n", (int)(VA)filp); + return -(int)(VA)filp; + } +- cap = cap_raised(current->cap_effective, CAP_SYS_RESOURCE); +- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); ++ cap = cap_raised(current_cap(), CAP_SYS_RESOURCE); ++ compat_cap_raise(CAP_SYS_RESOURCE); + res = HostIFDoIoctl(filp, RTC_PIE_ON, 0); + if (!cap) { +- cap_lower(current->cap_effective, CAP_SYS_RESOURCE); ++ compat_cap_lower(CAP_SYS_RESOURCE); + } + if (res < 0) { + Warning("/dev/rtc enable interrupt failed: %d\n", res); +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel +--- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel 2009-03-27 08:05:19.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 +@@ -22,7 +22,7 @@ + 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/nopage1.c, -DVMW_NOPAGE_261, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, ) +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel +--- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel 2009-03-27 08:05:20.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 +@@ -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)/epoll.c, -DVMW_HAVE_EPOLL, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) +diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c +--- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c 2009-03-27 08:05:20.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c 2009-04-07 16:15:21.000000000 +0400 +@@ -55,6 +55,30 @@ + struct net_device_stats stats; + } VNetNetIF; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++/* ++ Prior to KERNEL_VERSION(2, 6, 29) "struct net_device" had "void ++ *priv" field which was used as pointer to "VNetNetIF". ++*/ ++ ++#define VNetNetIF_netdev_priv_size 0 ++ ++#define VNetNetIF_netdev_netIf(dev) (*(VNetNetIF**)&((dev)->priv)) ++ ++#else ++/* ++ Since KERNEL_VERSION(2, 6, 29) pointer to "VNetNetIF" is stored in ++ explicitly allocated private area. ++*/ ++typedef struct { ++ VNetNetIF *netIf; ++} VNetNetIF_netdev_priv; ++ ++#define VNetNetIF_netdev_priv_size sizeof(VNetNetIF_netdev_priv) ++ ++#define VNetNetIF_netdev_netIf(dev) (((VNetNetIF_netdev_priv *)compat_netdev_priv(dev))->netIf) ++ ++#endif + + static void VNetNetIfFree(VNetJack *this); + static void VNetNetIfReceive(VNetJack *this, struct sk_buff *skb); +@@ -318,13 +342,13 @@ + memcpy(netIf->devName, devName, sizeof netIf->devName); + NULL_TERMINATE_STRING(netIf->devName); + +- dev = compat_alloc_netdev(0, netIf->devName, VNetNetIfSetup); ++ dev = compat_alloc_netdev(VNetNetIF_netdev_priv_size, netIf->devName, VNetNetIfSetup); + if (!dev) { + retval = -ENOMEM; + goto out; + } + +- dev->priv = netIf; ++ VNetNetIF_netdev_netIf(dev) = netIf; + netIf->dev = dev; + + memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr); +@@ -566,7 +590,7 @@ + VNetNetifStartXmit(struct sk_buff *skb, // IN: + struct net_device *dev) // IN: + { +- VNetNetIF *netIf = (VNetNetIF*)dev->priv; ++ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); + + if(skb == NULL) { + return 0; +@@ -618,7 +642,7 @@ + VNetNetifSetMAC(struct net_device *dev, // IN: + void *p) // IN: + { +- VNetNetIF *netIf = (VNetNetIF*)dev->priv; ++ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); + struct sockaddr const *addr = p; + if (!VMX86_IS_STATIC_MAC(addr->sa_data)) { + return -EINVAL; +@@ -675,7 +699,7 @@ + struct net_device_stats * + VNetNetifGetStats(struct net_device *dev) // IN: + { +- VNetNetIF *netIf = (VNetNetIF*)dev->priv; ++ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); + return &(netIf->stats); + } + +diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c +--- vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c 2009-03-27 08:05:23.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c 2009-04-07 16:15:21.000000000 +0400 +@@ -154,7 +154,7 @@ + goto error; + } + +- Log(buf); ++ Log("%s", buf); + + return; + +diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel +--- vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel 2009-03-27 08:05:23.000000000 +0300 ++++ vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 +@@ -25,7 +25,7 @@ + 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, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) + diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild new file mode 100644 index 000000000000..9eeb66971ba0 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild,v 1.1 2009/05/16 07:33:20 ikelos Exp $ + +KEYWORDS="~amd64 ~x86" +VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER + +PATCH_VER="1" + +inherit eutils vmware-mod + +LICENSE="GPL-2" +IUSE="" + +VMWARE_MODULE_LIST="vmmon vmnet vmblock vmci vsock" +SRC_URI="x86? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.x86.tar.bz2 ) + amd64? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.amd64.tar.bz2 )" +VMWARE_MOD_DIR="${PN}-${PVR}" + +src_unpack() { + vmware-mod_src_unpack + cd "${S}" + epatch "${FILESDIR}/${PVR}-kernel-2.6.29.patch" + epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" +} |