-Index: devel/debian/openvswitch-switch.openvswitch-nonetwork.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
===================================================================
--- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch-nonetwork.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open vSwitch Internal Unit
+EnvironmentFile=-/etc/sysconfig/openvswitch
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random $OPTIONS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
-Index: devel/debian/openvswitch-switch.openvswitch.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
===================================================================
--- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Open vSwitch
+
+[Install]
+WantedBy=multi-user.target
-Index: devel/debian/rules
+Index: openvswitch-2.7.0/debian/rules
===================================================================
---- devel.orig/debian/rules
-+++ devel/debian/rules
-@@ -53,7 +53,10 @@ override_dh_install:
- cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
+--- openvswitch-2.7.0.orig/debian/rules
++++ openvswitch-2.7.0/debian/rules
+@@ -56,7 +56,10 @@ override_dh_install-indep:
+ dh_install
override_dh_installinit:
- dh_installinit -R
override_dh_strip:
dh_strip --dbg-package=openvswitch-dbg
-Index: devel/debian/control
+Index: openvswitch-2.7.0/debian/control
===================================================================
---- devel.orig/debian/control
-+++ devel/debian/control
+--- openvswitch-2.7.0.orig/debian/control
++++ openvswitch-2.7.0/debian/control
@@ -14,6 +14,7 @@ Build-Depends: graphviz,
openssl,
procps,
Description: Open vSwitch switch implementations
Open vSwitch is a production quality, multilayer, software-based,
Ethernet virtual switch. It is designed to enable massive network
-Index: devel/debian/automake.mk
+Index: openvswitch-2.7.0/debian/automake.mk
===================================================================
---- devel.orig/debian/automake.mk
-+++ devel/debian/automake.mk
-@@ -27,7 +27,6 @@ EXTRA_DIST += \
+--- openvswitch-2.7.0.orig/debian/automake.mk
++++ openvswitch-2.7.0/debian/automake.mk
+@@ -24,7 +24,6 @@ EXTRA_DIST += \
debian/openvswitch-pki.postrm \
debian/openvswitch-switch.README.Debian \
debian/openvswitch-switch.dirs \
-Index: devel/debian/control
+Index: openvswitch-2.7.0/debian/control
===================================================================
---- devel.orig/debian/control
-+++ devel/debian/control
+--- openvswitch-2.7.0.orig/debian/control
++++ openvswitch-2.7.0/debian/control
@@ -14,46 +14,10 @@ Build-Depends: graphviz,
openssl,
procps,
Package: openvswitch-common
Architecture: linux-any
Depends: openssl,
-@@ -100,138 +64,6 @@ Description: Open vSwitch switch implementations
+@@ -100,114 +64,6 @@ Description: Open vSwitch switch impleme
openvswitch-switch provides the userspace components and utilities for
the Open vSwitch kernel-based switch.
- databases for OVN that is run at a central location.
-
-Package: ovn-docker
--Architecture: any
+-Architecture: linux-any
-Depends: openvswitch-switch (= ${binary:Version}),
- openvswitch-common (= ${binary:Version}),
- python (>= 2.7),
- .
- ovn-docker provides the docker drivers for OVN.
-
--Package: openvswitch-ipsec
--Architecture: linux-any
--Depends: ipsec-tools (>=0.8~alpha20101208),
-- iproute2,
-- openvswitch-common (= ${binary:Version}),
-- openvswitch-switch (= ${binary:Version}),
-- python,
-- python-openvswitch (= ${source:Version}),
-- racoon (>=0.8~alpha20101208),
-- ${misc:Depends},
-- ${shlibs:Depends}
--Description: Open vSwitch GRE-over-IPsec support
-- Open vSwitch is a production quality, multilayer, software-based,
-- Ethernet virtual switch. It is designed to enable massive network
-- automation through programmatic extension, while still supporting
-- standard management interfaces and protocols (e.g. NetFlow, IPFIX,
-- sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
-- to support distribution across multiple physical servers similar to
-- VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
-- .
-- The ovs-monitor-ipsec script provides support for encrypting GRE
-- tunnels with IPsec.
-- IPsec tunnels support is deprecated.
--
-Package: openvswitch-pki
-Architecture: all
-Depends: openvswitch-common (<< ${source:Version}.1~),
Package: openvswitch-dbg
Section: debug
Architecture: linux-any
-@@ -253,72 +85,3 @@ Description: Debug symbols for Open vSwitch packages
+@@ -229,72 +85,3 @@ Description: Debug symbols for Open vSwi
This package contains the debug symbols for all the other openvswitch-*
packages. Install it to debug one of them or to examine a core dump
produced by one of them.
- 1000V.
- .
- This package provides openvswitch headers and libopenvswitch for developers.
-Index: devel/debian/rules
+Index: openvswitch-2.7.0/debian/rules
===================================================================
---- devel.orig/debian/rules
-+++ devel/debian/rules
+--- openvswitch-2.7.0.orig/debian/rules
++++ openvswitch-2.7.0/debian/rules
@@ -12,7 +12,6 @@
#export DH_VERBOSE=1
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+:)?([0-9][a-zA-Z0-9.+:~-]*)(-[a-zA-Z0-9*.~]*),\2,p')
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-@@ -53,39 +52,6 @@ override_dh_install:
+@@ -53,42 +52,9 @@ override_dh_install-arch:
# openvswitch-switch
cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
- # ovn-central
- cp debian/ovn-central.template debian/ovn-central/usr/share/ovn/central/default.template
-
+ override_dh_install-indep:
+ dh_install
+
- # openvswitch-datapath-source
- cp debian/rules.modules debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
- chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules