summaryrefslogtreecommitdiff
path: root/vswitchd/automake.mk
Commit message (Collapse)AuthorAgeFilesLines
* automake: Consolidate schema checksum check.Gurucharan Shetty2015-10-021-9/+1
| | | | | Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
* automake.mk: Improve schema checksum error message.Mark D. Gray2015-03-191-1/+1
| | | | | | Signed-off-by: Mark D. Gray <mark.d.gray@intel.com> Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
* ovsdb-doc: Get manpage name from the XML file instead of command line.Ben Pfaff2015-02-191-1/+0
| | | | | | | This seems like a better place for it. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Gurucharan Shetty <gshetty@nicira.com>
* Makefiles: Add $(AM_V_GEN) annotations to clean up "make" output.Ben Pfaff2014-09-291-4/+4
| | | | | | | | The Open vSwitch "make" output was still pretty verbose even when configured with --enable-silent-rules. This cleans it up. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Joe Stringer <joestringer@nicira.com>
* acinclude.m4: Do not set vswitchd_ovs_vswitchd_LDFLAGSDaniele Di Proietto2014-08-181-0/+1
| | | | | | | | | | | | | Commit d731058395cb used vswitchd_ovs_vswitchd_LDFLAGS to link with DPDK. This made automake ignore AM_LDFLAGS while linking the daemon. This commit explicitly adds AM_LDFLAGS to vswitchd_ovs_vswitchd_LDFLAGS and moves it to vswitchd/automake.mk Reported-by: Gurucharan Shetty <gshetty@nicira.com> Suggested-by: Ben Pfaff <blp@nicira.com> Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com> Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
* Makefiles: Fix invocation of dot2pic when builddir != srcdir.Ben Pfaff2014-05-081-1/+1
| | | | | | CC: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: Ben Pfaff <blp@nicira.com> Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
* dot2pic: Stop assuming the path of the interpreterYAMAMOTO Takashi2014-05-091-1/+1
| | | | | | | On NetBSD, perl is usually installed as /usr/pkg/bin/perl. Acked-by: Ben Pfaff <blp@nicira.com> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
* dot2pic: Use "> $@; mv $@.tmp $@" notation to make this reliably failYAMAMOTO Takashi2014-05-091-1/+2
| | | | | Acked-by: Ben Pfaff <blp@nicira.com> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
* Revert commit 74622b44b ("Fix dot2pic make dependencies")YAMAMOTO Takashi2014-05-091-1/+1
| | | | | | | It turned out to be non-problem. Acked-by: Ben Pfaff <blp@nicira.com> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
* Fix dot2pic make dependenciesYAMAMOTO Takashi2014-05-071-1/+1
| | | | | | | I occasionally see the failure with "make -j32". Acked-by: Ben Pfaff <blp@nicira.com> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
* Makefile: Remove unnecessary includes of SSL_LIBS.Gurucharan Shetty2014-03-041-2/+1
| | | | | | | | | SSL_LIBS are needed for libopenvswitch and we include that in lib/automake.mk. It is not necessary to include it for every executable. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
* openvswitch: Use libtool and allow building shared libsHelmut Schaa2013-12-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | Currently openvswitch builds all libraries static only. However, libopenvswitch is linked into nearly all openvswitch executables making it hardly possible to run openvswitch on embedded devices (for example running OpenWrt). Convert openvswitch to use libtool for building its internal libs. This allows "--enable-shared" and "--enable-static" as configure arguments. Default is "--disable-shared" thus keeping the current behavior with the only change that static libs are installed by "make install". Since the openvswitch library interfaces are internal and thus not stable (yet) encode the openvswitch version into the library name: libopenvswitch-2.0.90.so Binary size is reduced to around 1/3 when using shared libs. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
* vswitchd: Use vswitch-specific variable name in automake.mk.Justin Pettit2013-10-171-2/+2
| | | | | | | | | The variable OVSDB_DOT_DIAGRAM_ARG is describing the vswitch dot file, so use the name VSWITCH_DOT_DIAGRAM_ARG to prevent confusion in the generated makefile. Signed-off-by: Justin Pettit <jpettit@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
* ovsdb-dot: Include arrows by default.Ben Pfaff2013-10-171-1/+1
| | | | | | | | | | | | | When ovsdb-dot generates diagrams for use in the manpages, the dot2pic postprocessor makes nicer output if the arrowheads are omitted (dot2pic adds the arrowheads itself). But for other uses that don't go through the postprocessor, we generally want the arrowheads. So this commit adds an option. On the principle that the default should be the least surprising to a naive user, arrowheads are included by default. Signed-off-by: Ben Pfaff <blp@nicira.com> Signed-off-by: Justin Pettit <jpettit@nicira.com> Acked-by: Justin Pettit <jpettit@nicira.com>
* ovsdb-doc: generate vswitch.[pic|gv] files only if dot tool is availableAnsis Atteka2013-10-171-30/+14
| | | | | | | | | | | | | These are auto-generated files, so it would be better not to keep them inside Open vSwitch repository. Behaviour before this patch was that if dot tool was not present on the system, then ovs-vswitchd.conf.db.5 would have used pre-generated vswitch.pic file that was already checked in the git repository. After this patch ovs-vswitchd.conf.db.5 will simply not have a dot diagram, if dot was not present at the time when Open vSwitch was built. Signed-off-by: Ansis Atteka <aatteka@nicira.com>
* vswitchd: Improve the readability of the E-R diagram.Ben Pfaff2013-10-081-1/+1
| | | | | Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Justin Pettit <jpettit@nicira.com>
* ovsdb-doc: Add ovsdb-doc to distribution tar ball.Gurucharan Shetty2013-07-311-0/+2
| | | | | | | | | | | | | | | | | Certain platforms like xenserver do not have the latest python libraries that are needed by ovsdb-doc (which in-turn creates ovs-vswitchd.conf.db.5). When we run 'make dist' and copy over the tar ball to xenserver ddk environemt, we already include ovs-vswitchd.conf.db.5. But the absence of ovsdb-doc results in an attempt to regenerate ovs-vswitchd.conf.db.5 and that fails because of the missing python libraries. Instead of producing ovsdb-doc from ovsdb-doc.in dynamically, we statically provide ovsdb-doc and pass on the version information to it through the command line option --version. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
* ovs-vswitchd.conf.db: Correct the header and footer lines.Gurucharan Shetty2013-07-301-1/+1
| | | | | | | | | | | | | | | Right now, the following 2 lines are how the header and footer looks like for ovs-vswitchd.conf.db @VERSION@(5) Open vSwitch Manual @VERSION@(5) Open vSwitch Open_vSwitch @VERSION@(5) After this commit, they look like this: ovs-vswitchd.conf.db(5) Open vSwitch Manual ovs-vswitchd.conf.db(5) Open vSwitch 1.12.90 ovs-vswitchd.conf.db(5) Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
* openvswitch: Remove Linux bridge compatibility.Pravin B Shelar2012-12-271-15/+1
| | | | | | | | | Currently brcompat does not work on master due to recent datapath changes. We have decided to remove it as it is not used very widely. Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Acked-by: Jesse Gross <jesse@nicira.com>
* config: Add explicit support for building on ESX.Ethan Jackson2012-10-091-1/+1
| | | | | | | | | | | | | The ESX userspace looks quite a bit like linux, but has some key differences which need to be specially handled in the build. To distinguish between ESX and systems which use the linux datapath module, this patch adds two new macros "ESX" and "LINUX_DATAPATH". It uses these macros to disable building code on ESX which only applies to a true Linux environment. In addition, it adds a new route-table-stub implementation which is required for the build to complete successfully on ESX. Signed-off-by: Ethan Jackson <ethan@nicira.com>
* Avoid possibly including an old vswitch-idl.h.Ben Pfaff2012-03-271-0/+4
| | | | | | | | | | | | | | | | | Codes that uses #include "vswitch-idl.h" can get an older version of this header, because this header file moved from vswitchd/ to lib/ and the older generated file might still be present. This helps out two ways: * "make clean" will delete the generated files from their old locations. * Use #include "lib/vswitch-idl.h" to explicitly avoid including the files from their old locations. Reported-by: Justin Pettit <jpettit@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
* idl: Move vswitch-idl to libopenvswitch.Ethan Jackson2012-03-191-14/+2
| | | | | | | This is cleaner then having multiple programs build the idl independently. Signed-off-by: Ethan Jackson <ethan@nicira.com>
* configure: add configure option to disable building brcompatChris Wright2012-03-131-3/+6
| | | | | | | | | | | | | | | | | | 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>
* docs: Always build ovs-vswitchd.conf.db.5 in srcdir.Ben Pfaff2011-11-111-1/+1
| | | | | | | | | | Otherwise we build it in the build directory by default, which breaks the Debian package build (unless we're working from a "make dist" created tarball since that has ovs-vswitchd.conf.db.5 in the srcdir as part of the distribution). Reported-by: Ansis Atteka <aatteka@nicira.com> Tested-by: Ansis Atteka <aatteka@nicira.com>
* Implement automatic dependency generation for manpages.Ben Pfaff2011-10-261-4/+3
| | | | | This ensures that manpages actually get rebuilt if any of the lib/*.man fragments that they depend upon are modified.
* vswitchd: Install vswitch.ovsschema to $(pkgdatadir).Ben Pfaff2011-06-201-0/+1
| | | | | | | This way, the xenserver spec file and the upcoming RHEL 5.6 spec file don't have to install it by hand. Signed-off-by: Ben Pfaff <blp@nicira.com>
* Remove /proc/net compatibility support.Ben Pfaff2011-02-111-2/+0
| | | | | | | | This feature was included only to allow Citrix QA to run some tests that interacted directly with the bridge. This feature hasn't been turned on for some time, so it should not be necessary any longer. Signed-off-by: Ben Pfaff <blp@nicira.com>
* vswitchd: Write build error message to stderr.Ben Pfaff2011-01-251-1/+1
| | | | Suggested-by: Andrew Evans <aevans@nicira.com>
* vswitchd: Fail the build when the schema checksum does not match.Ben Pfaff2011-01-251-0/+1
| | | | | | | | | Before, a bad checksum was easy to miss because the build still succeeded. With this change, a bad checksum makes the build fail. This is what I thought the existing code already did, but I was wrong. Suggested-by: Andrew Evans <aevans@nicira.com>
* vswitchd: Fix "make distcheck" by cleaning up stray "stamp" file.Ben Pfaff2011-01-101-0/+1
|
* Implement database schema versioning.Ben Pfaff2010-12-271-0/+12
| | | | | As the database schema evolves, it might be useful to have an identifier for the particular version in use. This commit adds that feature.
* docs: Only regenerate vswitch.pic when the schema really changes.Ben Pfaff2010-12-061-10/+27
| | | | | | | | | Until now, vswitch.pic has been rebuilt whenever the schema changed. This is OK when the E-R diagram would really change, but many changes to the schema don't change the E-R diagram, and it surprises people when vswitch.pic changes in such a situation. This commit fixes the problem. Requested-by: Justin Pettit <jpettit@nicira.com>
* docs: Implement our own dot->pic translator.Ben Pfaff2010-11-051-5/+4
| | | | | | | | Recent versions of Graphviz no longer support output to PIC format, so this commit adds our own internal translator from dot's "plain" output format to PIC format. The "plain" format works best with slightly different "dot" input (advised by the Graphviz manual description of the "plain" format) so this commit also adjusts ovsdb-dot's output.
* Add missing file to distribution.Ben Pfaff2010-09-231-0/+1
|
* ovs-vswitchd: Export system stats through Open_vSwitch table.Ben Pfaff2010-09-231-0/+1
| | | | | | | | | | This is intended to provide controllers enough information to determine whether a switch is overloaded or busted, to enable them to spread load fairly across a group of switches. Feature #2421. CC: Peter Balland <peter@nicira.com>
* vswitchd: Add entity-relationship diagram to ovs-vswitchd.conf.db.5.Ben Pfaff2010-06-241-1/+19
| | | | | I've updated http://openvswitch.org/ovs-vswitchd.conf.db.5.pdf with example output.
* Distribute files that had been overlooked.Ben Pfaff2010-05-271-1/+3
| | | | | | | In general, every file in the Git repository should be distributed, except for files that are specific to Git, such as the .gitignore files. But we had overlooked several of them. This commit makes sure that they get distributed.
* vswitchd: Build ovs-brcompatd only on Linux systems.Ben Pfaff2010-05-261-6/+6
| | | | This feature is Linux-specific.
* Add documentation for the vswitch database schema.Ben Pfaff2010-03-051-3/+12
| | | | | We can do better than this (I already have some comments) but this is still much better than what we had.
* Remove PCRE dependency.Ben Pfaff2010-02-251-3/+2
|
* ovsdb: Add simple constraints.Ben Pfaff2010-02-081-2/+3
|
* Merge branch 'master' into nextJustin Pettit2010-02-051-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: COPYING datapath/datapath.h lib/automake.mk lib/dpif-provider.h lib/dpif.c lib/hmap.h lib/netdev-provider.h lib/netdev.c lib/stream-ssl.h ofproto/executer.c ofproto/ofproto.c ofproto/ofproto.h tests/automake.mk utilities/ovs-ofctl.c utilities/ovs-vsctl.in vswitchd/ovs-vswitchd.conf.5.in xenserver/etc_init.d_vswitch xenserver/etc_xensource_scripts_vif xenserver/opt_xensource_libexec_interface-reconfigure
| * Initial implementation of sFlow.Ben Pfaff2010-01-041-0/+1
| | | | | | | | Tested very slightly with "ping" and "sflowtool -t | tcpdump -r -".
* | Cleanly separate IDL annotations from OVSDB schema information.Ben Pfaff2010-01-261-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the OVSDB IDL annotations have been glommed together with the schema information in a single file, and then we've used ovsdb-idlc to extract the schema from that file. This commit reverses the process: the schema and the annotations are stored separately and then glommed together as necessary at build time. This new arrangement has a few advantages: - We can now easily have multiple different sets of IDL annotations for a single OVSDB schema. For example, some users may not need access to columns that other users do. - Bugs in ovsdb-idlc cannot screw up the underlying schema (as shown by a recent commit).
* | stream: Really enable SSL streams.Ben Pfaff2010-01-071-1/+1
| | | | | | | | SSL streams were supposed to work, but they didn't. Oops.
* | Remove "fault" module.Ben Pfaff2010-01-061-4/+1
| | | | | | | | | | | | | | | | | | This module, which catches segmentation faults and prints a backtrace before exiting, was useful for a while, but I believe that it has now outlived its purpose. It is altogether better to have a core dump from which one can extract much more information than a usually-poor backtrace, and core dumps are much better integrated into a typical Unix system. In addition, the "fault" module was of course not all that portable.
* | vswitch: Generate text file documenting the vswitch schema.Ben Pfaff2009-12-111-4/+10
| | | | | | | | | | Now you can read vswitchd/vswitch-idl.txt for some textual documentation of the OVS schema.
* | ovs-brcompatd: First cut at integration with new config dbJustin Pettit2009-12-101-1/+3
| | | | | | | | | | | | | | This is an extremely lightly tested attempt at switching ovs-brcompatd from using the config file to the new config db. There are a lot of shortcomings in this cut, but we need to make progress on the XenServer integration, so it's going in now. Expect changes in the near future.
* | ovsdb-idlc: Add rules to make sure .h files get generated before .c files.Ben Pfaff2009-12-071-0/+1
| | | | | | | | | | The .c files #include the .h files so the .h files need to be generated first.
* | Distribute ovsdb-idlc built sources, so Python is not required for build.Ben Pfaff2009-12-031-0/+1
| | | | | | | | | | | | | | The Xen DDK VM does not include Python, so it's best if we don't have to require it for the build. The built sources are still regenerated if necessary.
View Lorry Controller Status