ovs-bugtool is no longer Debian-specific, so install it everywhere. (On
XenServer, specifically, we do not install it, because there xen-bugtool
already exists.)
---
debian/automake.mk | 2 --
debian/copyright.in | 4 ++--
debian/openvswitch-common.install | 4 ++--
utilities/automake.mk | 7 ++++++-
{debian => utilities}/ovs-bugtool | 0
{debian => utilities}/ovs-bugtool.8 | 0
xenserver/openvswitch-xen.spec | 2 ++
7 files changed, 12 insertions(+), 7 deletions(-)
rename {debian => utilities}/ovs-bugtool (100%)
rename {debian => utilities}/ovs-bugtool.8 (100%)
diff --git a/debian/automake.mk b/debian/automake.mk
index 74ff5fc..26db1cb 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -36,8 +36,6 @@ EXTRA_DIST += \
debian/openvswitch-switch.template \
debian/ovsdbmonitor.install \
debian/ovsdbmonitor.manpages \
- debian/ovs-bugtool \
- debian/ovs-bugtool.8 \
debian/ovs-monitor-ipsec \
debian/python-openvswitch.dirs \
debian/python-openvswitch.install \
diff --git a/debian/copyright.in b/debian/copyright.in
index 354ab80..2f2cc48 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,7 +8,7 @@ Upstream Authors (from AUTHORS):
Upstream Copyright Holders:
- Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
+ Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
and authors listed above.
@@ -52,7 +52,7 @@ License:
* The following components are licensed under the
GNU Lesser General Public Licence version 2.1.
- debian/ovs-bugtool
+ utilities/ovs-bugtool
xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
xenserver/etc_xensource_bugtool_system-configuration.xml [*]
diff --git a/debian/openvswitch-common.install
b/debian/openvswitch-common.install
index 1733612..30fc24b 100644
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -4,6 +4,6 @@ _debian/utilities/ovs-appctl usr/sbin
_debian/utilities/ovs-ofctl usr/sbin
_debian/utilities/ovs-parse-leaks usr/bin
_debian/utilities/ovs-pki usr/sbin
-debian/ovs-bugtool usr/sbin
-debian/ovs-bugtool.8 usr/share/man/man8
+utilities/ovs-bugtool usr/sbin
+utilities/ovs-bugtool.8 usr/share/man/man8
vswitchd/vswitch.ovsschema usr/share/openvswitch
diff --git a/utilities/automake.mk b/utilities/automake.mk
index 69cc5d2..0cb0bf5 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -7,15 +7,19 @@ bin_PROGRAMS += \
bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
if HAVE_PYTHON
bin_SCRIPTS += \
+ utilities/ovs-bugtool \
utilities/ovs-pcap \
utilities/ovs-tcpundump \
utilities/ovs-vlan-test
+man_MANS += utilities/ovs-bugtool.8
endif
noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
EXTRA_DIST += \
utilities/ovs-appctl.8.in \
+ utilities/ovs-bugtool \
+ utilities/ovs-bugtool.8 \
utilities/ovs-controller.8.in \
utilities/ovs-ctl.in \
utilities/ovs-dpctl.8.in \
@@ -68,7 +72,8 @@ man_MANS += \
utilities/ovs-vlan-bug-workaround.8 \
utilities/ovs-vlan-test.8 \
utilities/ovs-vsctl.8
-dist_man_MANS += utilities/ovs-ctl.8
+dist_man_MANS += \
+ utilities/ovs-ctl.8
utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
utilities_ovs_appctl_LDADD = lib/libopenvswitch.a
diff --git a/debian/ovs-bugtool b/utilities/ovs-bugtool
similarity index 100%
rename from debian/ovs-bugtool
rename to utilities/ovs-bugtool
diff --git a/debian/ovs-bugtool.8 b/utilities/ovs-bugtool.8
similarity index 100%
rename from debian/ovs-bugtool.8
rename to utilities/ovs-bugtool.8
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index f9d7464..77afeb2 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -121,8 +121,10 @@ install xenserver/uuid.py
$RPM_BUILD_ROOT/usr/share/openvswitch/python
# Get rid of stuff we don't want to make RPM happy.
rm \
+ $RPM_BUILD_ROOT/usr/bin/ovs-bugtool \
$RPM_BUILD_ROOT/usr/bin/ovs-controller \
$RPM_BUILD_ROOT/usr/bin/ovs-pki \
+ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-bugtool.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
--
1.7.4.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
