← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/freebsd/vmblock/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/freebsd/vmblock/Makefile
39
39
HEADERS += os.h
40
40
 
41
41
CSRCS  := block.c
 
42
CSRCS  += os_panic.c
42
43
CSRCS  += vfsops.c
43
44
CSRCS  += vnops.c
44
45
CSRCS  += subr.c
 
46
CSRCS  += stubs.c
45
47
 
46
48
SRCS   := $(HEADERS) $(CSRCS)
47
49
 
60
62
   CFLAGS += -I$(OVT_SOURCE_DIR)/modules/freebsd/shared
61
63
   CFLAGS += -I$(OVT_SOURCE_DIR)/modules/freebsd/vmblock
62
64
   CFLAGS += -I$(OVT_SOURCE_DIR)/modules/shared/vmblock
63
 
   VPATH  := $(OVT_SOURCE_DIR)/lib/misc
64
 
   VPATH  := $(VPATH):$(OVT_SOURCE_DIR)/modules/shared/vmblock
 
65
   VPATH  := $(OVT_SOURCE_DIR)/modules/shared/vmblock
65
66
.else
66
67
   CFLAGS += -Ishared
67
68
.endif