diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2012-03-13 16:21:55 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2012-03-13 16:50:42 -0700 |
| commit | d8965755e707d97a515359a3d3732c46930d5350 (patch) | |
| tree | 281f4d85f53ffa0c61bdb391f36a24e86cce27fb /datapath | |
| parent | 199253134cdf556647b45bb882b4b6e8af4c1669 (diff) | |
configure: add configure option to disable building brcompat
This adds ability to do:
./configure --disable-brcompat
to disable building userspace and kernel module associated with
providing linux bridge compatibility. Sources should still be
distributed w/ make dist.
While there, update comment referring to long removed veth driver
which is now relevant for brcompat module.
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Acked-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/Modules.mk | 2 | ||||
| -rw-r--r-- | datapath/linux/Makefile.main.in | 1 | ||||
| -rw-r--r-- | datapath/linux/Modules.mk | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/datapath/Modules.mk b/datapath/Modules.mk index 96e7f7df..24c1075b 100644 --- a/datapath/Modules.mk +++ b/datapath/Modules.mk @@ -1,7 +1,7 @@ # Some modules should be built and distributed, e.g. openvswitch. # # Some modules should be distributed but not built, e.g. we do not build -# veth if the kernel in question already has it. +# brcompat if configured without it # # Some modules should be built but not distributed, e.g. third-party # hwtable modules. diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in index b55fc957..6b46c0c0 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -4,6 +4,7 @@ export srcdir = @abs_srcdir@ export top_srcdir = @abs_top_srcdir@ export KSRC = @KBUILD@ export VERSION = @VERSION@ +export BUILD_BRCOMPAT = @BUILD_BRCOMPAT@ include $(srcdir)/../Modules.mk include $(srcdir)/Modules.mk diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index d9a85ccb..baa4196a 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -69,6 +69,8 @@ openvswitch_headers += \ linux/compat/include/net/netns/generic.h \ linux/compat/genetlink.inc -both_modules += brcompat +# always distribute brcompat source regardless of local build configuration +dist_modules += brcompat +build_modules += $(if $(BUILD_BRCOMPAT),brcompat) brcompat_sources = linux/compat/genetlink-brcompat.c brcompat_main.c brcompat_headers = |