Originally I intended this as just a cleanup, but as a side effect it also installs some files from the install tree in debian/tmp instead of from _debian. This should avoid a reported problem in which ovs-bugtool was being created in the source directory instead of the build directory (I still don't see why this happened).
Reported-by: Sébastien RICCIO <[email protected]> CC: Simon Horman <[email protected]> --- AUTHORS | 1 + debian/.gitignore | 1 + debian/compat | 2 +- debian/openvswitch-common.install | 20 ++++++++++---------- debian/openvswitch-controller.install | 2 +- debian/openvswitch-switch.install | 20 ++++++++++---------- debian/rules | 6 +++--- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/AUTHORS b/AUTHORS index cd6832c..2f720fc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -82,6 +82,7 @@ Rob Hoes [email protected] Roger Leigh [email protected] Sean Brady [email protected] Sebastian Andrzej Siewior [email protected] +Sébastien RICCIO [email protected] Srini Seetharaman [email protected] Stephen Hemminger [email protected] Takayuki HAMA [email protected] diff --git a/debian/.gitignore b/debian/.gitignore index 63434ca..b681ee4 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -17,3 +17,4 @@ /openvswitch-switch.copyright /ovsdbmonitor /python-openvswitch +/tmp diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install index 517a817..7448747 100644 --- a/debian/openvswitch-common.install +++ b/debian/openvswitch-common.install @@ -1,10 +1,10 @@ -_debian/ovsdb/ovsdb-client usr/bin -_debian/ovsdb/ovsdb-tool usr/bin -_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/openvswitch/etc/openvswitch/bugtool-plugins etc/openvswitch -debian/openvswitch/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show -_debian/utilities/bugtool/ovs-bugtool usr/sbin -vswitchd/vswitch.ovsschema usr/share/openvswitch +etc/openvswitch/bugtool-plugins +usr/bin/ovs-appctl +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-controller.install b/debian/openvswitch-controller.install index 7d0edbb..a22ec45 100644 --- a/debian/openvswitch-controller.install +++ b/debian/openvswitch-controller.install @@ -1 +1 @@ -_debian/utilities/ovs-controller usr/sbin +usr/bin/ovs-controller diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install index bb6b46a..4fa87bd 100644 --- a/debian/openvswitch-switch.install +++ b/debian/openvswitch-switch.install @@ -1,10 +1,10 @@ -_debian/ovsdb/ovsdb-server usr/bin -_debian/utilities/ovs-dpctl usr/sbin -_debian/utilities/ovs-ctl usr/share/openvswitch/scripts -_debian/utilities/ovs-lib.sh usr/share/openvswitch/scripts -_debian/utilities/ovs-vsctl usr/sbin -_debian/utilities/ovs-pcap usr/bin -_debian/utilities/ovs-tcpundump usr/bin -_debian/utilities/ovs-vlan-test usr/bin -_debian/vswitchd/ovs-vswitchd usr/sbin -utilities/ovs-save usr/share/openvswitch/scripts +usr/bin/ovs-dpctl +usr/bin/ovs-pcap +usr/bin/ovs-tcpundump +usr/bin/ovs-vlan-test +usr/bin/ovs-vsctl +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 diff --git a/debian/rules b/debian/rules index 357285f..224f095 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ install: install-indep install-arch install-indep: build-indep dh_testdir dh_testroot - dh_clean -k -i + dh_prep -i dh_installdirs -i dh_install -i sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \ @@ -84,9 +84,9 @@ install-indep: build-indep install-arch: build-arch dh_testdir dh_testroot - dh_clean -k -s + dh_prep -s dh_installdirs -s - $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openvswitch install + $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template dh_install -s -- 1.7.4.4 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
