mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

ovn-nbctl: Move ovn-nbctl to utilities directory.

Browse Source 
Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
This commit is contained in:
Alex Wang 2015-08-04 11:31:22 -07:00
parent 62fdd819ef
commit 5b5c922b0c
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ovn/.gitignore vendored
View File

@ -5,5 +5,3 @@
/ovn-sb.5 /ovn-sb.5
/ovn-sb.gv /ovn-sb.gv
/ovn-sb.pic /ovn-sb.pic
/ovn-nbctl
/ovn-nbctl.8

11
ovn/automake.mk
View File

@ -66,20 +66,15 @@ ovn/ovn-nb.5: \
$(srcdir)/ovn/ovn-nb.xml > $@.tmp && \ $(srcdir)/ovn/ovn-nb.xml > $@.tmp && \
mv $@.tmp $@ mv $@.tmp $@
man_MANS += ovn/ovn-architecture.7 ovn/ovn-nbctl.8 man_MANS += ovn/ovn-architecture.7
EXTRA_DIST += ovn/ovn-architecture.7.xml ovn/ovn-nbctl.8.xml EXTRA_DIST += ovn/ovn-architecture.7.xml
DISTCLEANFILES += ovn/ovn-nbctl.8 ovn/ovn-architecture.7 DISTCLEANFILES += ovn/ovn-architecture.7
EXTRA_DIST += \ EXTRA_DIST += \
ovn/TODO \ ovn/TODO \
ovn/CONTAINERS.OpenStack.md \ ovn/CONTAINERS.OpenStack.md \
ovn/OVN-GW-HA.md ovn/OVN-GW-HA.md
# ovn-nbctl
bin_PROGRAMS += ovn/ovn-nbctl
ovn_ovn_nbctl_SOURCES = ovn/ovn-nbctl.c
ovn_ovn_nbctl_LDADD = ovn/lib/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la
include ovn/controller/automake.mk include ovn/controller/automake.mk
include ovn/lib/automake.mk include ovn/lib/automake.mk
include ovn/northd/automake.mk include ovn/northd/automake.mk

2
ovn/utilities/.gitignore vendored
View File

@ -1 +1,3 @@
/ovn-ctl.8 /ovn-ctl.8
/ovn-nbctl
/ovn-nbctl.8

14
ovn/utilities/automake.mk
View File

@ -2,11 +2,19 @@ scripts_SCRIPTS += \
ovn/utilities/ovn-ctl ovn/utilities/ovn-ctl
man_MANS += \ man_MANS += \
ovn/utilities/ovn-ctl.8 ovn/utilities/ovn-ctl.8 \
ovn/utilities/ovn-nbctl.8
EXTRA_DIST += \ EXTRA_DIST += \
ovn/utilities/ovn-ctl \ ovn/utilities/ovn-ctl \
ovn/utilities/ovn-ctl.8.xml ovn/utilities/ovn-ctl.8.xml \
ovn/utilities/ovn-nbctl.8.xml
DISTCLEANFILES += \ DISTCLEANFILES += \
ovn/utilities/ovn-ctl.8 ovn/utilities/ovn-ctl.8 \
ovn/utilities/ovn-nbctl.8
# ovn-nbctl
bin_PROGRAMS += ovn/utilities/ovn-nbctl
ovn_utilities_ovn_nbctl_SOURCES = ovn/utilities/ovn-nbctl.c
ovn_utilities_ovn_nbctl_LDADD = ovn/lib/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la

0
ovn/ovn-nbctl.8.xml → ovn/utilities/ovn-nbctl.8.xml
View File

0
ovn/ovn-nbctl.c → ovn/utilities/ovn-nbctl.c
View File

2
tutorial/ovs-sandbox
View File

@ -248,7 +248,7 @@ if $built; then
fi fi
PATH=$builddir/ovsdb:$builddir/vswitchd:$builddir/utilities:$PATH PATH=$builddir/ovsdb:$builddir/vswitchd:$builddir/utilities:$PATH
if $ovn; then if $ovn; then
PATH=$builddir/ovn:$builddir/ovn/controller:$builddir/ovn/northd:$PATH PATH=$builddir/ovn:$builddir/ovn/controller:$builddir/ovn/northd:$builddir/ovn/utilities:$PATH
fi fi
export PATH export PATH
else else

2
utilities/ovs-sim.in
View File

@ -70,7 +70,7 @@ fi
# Put built tools early in $PATH. # Put built tools early in $PATH.
PATH=$sim_builddir/ovsdb:$sim_builddir/vswitchd:$sim_builddir/utilities:$PATH PATH=$sim_builddir/ovsdb:$sim_builddir/vswitchd:$sim_builddir/utilities:$PATH
PATH=$sim_builddir/ovn:$sim_srcdir/ovn:$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$PATH PATH=$sim_builddir/ovn:$sim_srcdir/ovn:$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$sim_builddir/ovn/utilities:$PATH
export PATH export PATH
rm -rf sandbox rm -rf sandbox