From: Ben Pfaff Date: Tue, 26 Jul 2011 16:46:38 +0000 (-0700) Subject: debian: Move OVSDB schema and ovsdb-tool to openvswitch-switch. X-Git-Tag: v1.2.0~24 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=9dae0a2675cf3f63b983c5ef039a665bb41d4467;p=sliver-openvswitch.git debian: Move OVSDB schema and ovsdb-tool to openvswitch-switch. ovs-vswitchd in the openvswitch-switch package is tightly coupled to its database schema. During development, it's possible to change the schema without changing the Open vSwitch version number, which makes it possible for the openvswitch-switch and openvswitch-common packages to get out of sync: openvswitch-switch requires the same version of openvswitch-common, but if the version number doesn't get updated that has no effect. Actually putting the schema and ovs-vswitchd (its primary user) in the same package prevents them from getting out-of-sync. This commit also moves ovsdb-tool because that program often works directly with OVSDB schemas and so there's not much point having it around without a schema to work with. --- diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install index 744874704..758c59c2c 100644 --- a/debian/openvswitch-common.install +++ b/debian/openvswitch-common.install @@ -4,7 +4,5 @@ usr/bin/ovs-ofctl usr/bin/ovs-parse-leaks usr/bin/ovs-pki usr/bin/ovsdb-client -usr/bin/ovsdb-tool usr/sbin/ovs-bugtool usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show -usr/share/openvswitch/vswitch.ovsschema diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install index 4fa87bdd5..308c382ad 100644 --- a/debian/openvswitch-switch.install +++ b/debian/openvswitch-switch.install @@ -3,8 +3,10 @@ usr/bin/ovs-pcap usr/bin/ovs-tcpundump usr/bin/ovs-vlan-test usr/bin/ovs-vsctl +usr/bin/ovsdb-tool usr/sbin/ovs-vswitchd usr/sbin/ovsdb-server usr/share/openvswitch/scripts/ovs-ctl usr/share/openvswitch/scripts/ovs-lib.sh usr/share/openvswitch/scripts/ovs-save +usr/share/openvswitch/vswitch.ovsschema