← Back to branch summary

~n-muench/ubuntu/maverick/open-vm-tools/open-vm-tools.fix-632101

« back to all changes in this revision

Viewing changes to modules/linux/vmblock/Makefile.kernel

  • Committer: Nate Muench
  • Date: 2010-09-07 02:10:30 UTC
  • Revision ID: nowiwilldestroyabydos@gmail.com-20100907021030-msa3598ldopvwkye
http://bugs.debian.org/579721
http://bugs.debian.org/588356
https://launchpad.net/bugs/632101
* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.
* Updating local Makefile to inject symvers files to fix vmhgfs and
  vsock modules, thanks to Joe Gooch <mrwizard@k12system.com> (Closes:
  #579721).
* Updating standards version to 3.9.1.
* Removing vmmemctl fom initscript (Closes: #588356).
* Merging upstream version 2010.06.16-268169.
* Updating standards version to 3.9.0.
* Updating README.source.
* Rediffing kvers.patch.
* Dropping procps.patch, not required anymore.
* Updating packaging for upstreams vmmemctl module removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vmblock/Makefile.kernel
21
21
 
22
22
EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
23
23
 
24
 
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
25
 
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
26
24
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/skas1.c,   -DVMW_SKAS_MMAP, )
27
25
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
28
26
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )