pvepatches/remove-unneeded-from-control.patch

   1 Index: devel/debian/control
   2 ===================================================================
   3 --- devel.orig/debian/control
   4 +++ devel/debian/control
   5 @@ -14,46 +14,10 @@ Build-Depends: graphviz,
   6                 openssl,
   7                 procps,
   8                 python-all (>= 2.7),
   9 -               python-twisted-conch,
  10 -               python-zopeinterface,
  11                 python-six
  12  Standards-Version: 3.9.3
  13  Homepage: http://openvswitch.org/
  14
  15 -Package: openvswitch-datapath-source
  16 -Architecture: all
  17 -Depends: bzip2, debhelper (>= 5.0.37), module-assistant, ${misc:Depends}
  18 -Suggests: openvswitch-switch
  19 -Description: Open vSwitch datapath module source - module-assistant version
  20 - Open vSwitch is a production quality, multilayer, software-based,
  21 - Ethernet virtual switch. It is designed to enable massive network
  22 - automation through programmatic extension, while still supporting
  23 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
  24 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
  25 - to support distribution across multiple physical servers similar to
  26 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
  27 - .
  28 - This package provides the Open vSwitch datapath module source code
  29 - that is needed by openvswitch-switch.  The kernel module can be built
  30 - from it using module-assistant or make-kpkg.  README.Debian in this
  31 - package provides further instructions.
  32 -
  33 -Package: openvswitch-datapath-dkms
  34 -Architecture: all
  35 -Depends: dkms (>= 1.95), libc6-dev, make, ${misc:Depends}, ${python:Depends}
  36 -Description: Open vSwitch datapath module source - DKMS version
  37 - Open vSwitch is a production quality, multilayer, software-based,
  38 - Ethernet virtual switch. It is designed to enable massive network
  39 - automation through programmatic extension, while still supporting
  40 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
  41 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
  42 - to support distribution across multiple physical servers similar to
  43 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
  44 - .
  45 - This package provides the Open vSwitch datapath module source code
  46 - that is needed by openvswitch-switch.  DKMS can built the kernel
  47 - module from it.
  48 -
  49  Package: openvswitch-common
  50  Architecture: linux-any
  51  Depends: openssl,
  52 @@ -100,138 +64,6 @@ Description: Open vSwitch switch implementations
  53   openvswitch-switch provides the userspace components and utilities for
  54   the Open vSwitch kernel-based switch.
  55
  56 -Package: ovn-common
  57 -Architecture: linux-any
  58 -Depends: openvswitch-common (= ${binary:Version}),
  59 -         ${misc:Depends},
  60 -         ${shlibs:Depends}
  61 -Description: OVN common components
  62 - OVN, the Open Virtual Network, is a system to support virtual network
  63 - abstraction.  OVN complements the existing capabilities of OVS to add
  64 - native support for virtual network abstractions, such as virtual L2 and L3
  65 - overlays and security groups.
  66 - .
  67 - ovn-common provides components required by other OVN packages.
  68 -
  69 -Package: ovn-controller-vtep
  70 -Architecture: linux-any
  71 -Depends: ovn-common (= ${binary:Version}),
  72 -         ${misc:Depends},
  73 -         ${shlibs:Depends}
  74 -Description: OVN vtep controller
  75 - ovn-controller-vtep is the local controller daemon in
  76 - OVN, the Open Virtual Network, for VTEP enabled physical switches.
  77 - It connects up to the OVN Southbound database over the OVSDB protocol,
  78 - and down to the VTEP database over the OVSDB protocol.
  79 - .
  80 - ovn-controller-vtep provides the ovn-controller-vtep binary for controlling
  81 - vtep gateways.
  82 -
  83 -
  84 -Package: ovn-host
  85 -Architecture: linux-any
  86 -Depends: openvswitch-switch (= ${binary:Version}),
  87 -         openvswitch-common (= ${binary:Version}),
  88 -         ovn-common (= ${binary:Version}),
  89 -         ${misc:Depends},
  90 -         ${shlibs:Depends}
  91 -Description: OVN host components
  92 - OVN, the Open Virtual Network, is a system to support virtual network
  93 - abstraction.  OVN complements the existing capabilities of OVS to add
  94 - native support for virtual network abstractions, such as virtual L2 and L3
  95 - overlays and security groups.
  96 - .
  97 - ovn-host provides the userspace components and utilities for
  98 - OVN that can be run on every host/hypervisor.
  99 -
 100 -Package: ovn-central
 101 -Architecture: linux-any
 102 -Depends: openvswitch-switch (= ${binary:Version}),
 103 -         openvswitch-common (= ${binary:Version}),
 104 -         ovn-common (= ${binary:Version}),
 105 -         ${misc:Depends},
 106 -         ${shlibs:Depends}
 107 -Description: OVN central components
 108 - OVN, the Open Virtual Network, is a system to support virtual network
 109 - abstraction.  OVN complements the existing capabilities of OVS to add
 110 - native support for virtual network abstractions, such as virtual L2 and L3
 111 - overlays and security groups.
 112 - .
 113 - ovn-central provides the userspace daemons, utilities and
 114 - databases for OVN that is run at a central location.
 115 -
 116 -Package: ovn-docker
 117 -Architecture: any
 118 -Depends: openvswitch-switch (= ${binary:Version}),
 119 -         openvswitch-common (= ${binary:Version}),
 120 -         python (>= 2.7),
 121 -         python-openvswitch (= ${source:Version}),
 122 -         ovn-common (= ${binary:Version}),
 123 -         ${misc:Depends},
 124 -         ${python:Depends},
 125 -         ${shlibs:Depends}
 126 -Description: OVN Docker drivers
 127 - OVN, the Open Virtual Network, is a system to support virtual network
 128 - abstraction.  OVN complements the existing capabilities of OVS to add
 129 - native support for virtual network abstractions, such as virtual L2 and L3
 130 - overlays and security groups.
 131 - .
 132 - ovn-docker provides the docker drivers for OVN.
 133 -
 134 -Package: openvswitch-ipsec
 135 -Architecture: linux-any
 136 -Depends: ipsec-tools (>=0.8~alpha20101208),
 137 -         iproute2,
 138 -         openvswitch-common (= ${binary:Version}),
 139 -         openvswitch-switch (= ${binary:Version}),
 140 -         python,
 141 -         python-openvswitch (= ${source:Version}),
 142 -         racoon (>=0.8~alpha20101208),
 143 -         ${misc:Depends},
 144 -         ${shlibs:Depends}
 145 -Description: Open vSwitch GRE-over-IPsec support
 146 - Open vSwitch is a production quality, multilayer, software-based,
 147 - Ethernet virtual switch. It is designed to enable massive network
 148 - automation through programmatic extension, while still supporting
 149 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
 150 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
 151 - to support distribution across multiple physical servers similar to
 152 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
 153 - .
 154 - The ovs-monitor-ipsec script provides support for encrypting GRE
 155 - tunnels with IPsec.
 156 - IPsec tunnels support is deprecated.
 157 -
 158 -Package: openvswitch-pki
 159 -Architecture: all
 160 -Depends: openvswitch-common (<< ${source:Version}.1~),
 161 -         openvswitch-common (>= ${source:Version}),
 162 -         ${misc:Depends}
 163 -Description: Open vSwitch public key infrastructure dependency package
 164 - Open vSwitch is a production quality, multilayer, software-based,
 165 - Ethernet virtual switch. It is designed to enable massive network
 166 - automation through programmatic extension, while still supporting
 167 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
 168 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
 169 - to support distribution across multiple physical servers similar to
 170 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
 171 - .
 172 - openvswitch-pki provides PKI (public key infrastructure) support for
 173 - Open vSwitch switches and controllers, reducing the risk of
 174 - man-in-the-middle attacks on the Open vSwitch network infrastructure.
 175 -
 176 -Package: openvswitch-testcontroller
 177 -Architecture: linux-any
 178 -Depends: openvswitch-common (= ${binary:Version}),
 179 -         openvswitch-pki (= ${source:Version}),
 180 -         ${misc:Depends},
 181 -         ${shlibs:Depends}
 182 -Description: Simple controller for testing OpenFlow setups
 183 - This controller enables OpenFlow switches that connect to it to act
 184 - as MAC-learning Ethernet switches.  It can be used for initial
 185 - testing of OpenFlow networks.  It is not a necessary or desirable
 186 - part of a production OpenFlow deployment.
 187 -
 188  Package: openvswitch-dbg
 189  Section: debug
 190  Architecture: linux-any
 191 @@ -253,72 +85,3 @@ Description: Debug symbols for Open vSwitch packages
 192   This package contains the debug symbols for all the other openvswitch-*
 193   packages.  Install it to debug one of them or to examine a core dump
 194   produced by one of them.
 195 -
 196 -Package: python-openvswitch
 197 -Architecture: all
 198 -Section: python
 199 -Depends: ${misc:Depends}, ${python:Depends}, python-six
 200 -Description: Python bindings for Open vSwitch
 201 - Open vSwitch is a production quality, multilayer, software-based,
 202 - Ethernet virtual switch. It is designed to enable massive network
 203 - automation through programmatic extension, while still supporting
 204 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
 205 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
 206 - to support distribution across multiple physical servers similar to
 207 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
 208 - .
 209 - This package contains the full Python bindings for Open vSwitch database.
 210 -
 211 -Package: openvswitch-test
 212 -Architecture: all
 213 -Depends: python (>= 2.7) | python-argparse,
 214 -         python-twisted-web,
 215 -         ${misc:Depends},
 216 -         ${python:Depends}
 217 -Description: Open vSwitch test package
 218 - Open vSwitch is a production quality, multilayer, software-based,
 219 - Ethernet virtual switch. It is designed to enable massive network
 220 - automation through programmatic extension, while still supporting
 221 - standard management interfaces and protocols (e.g. NetFlow, IPFIX,
 222 - sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
 223 - to support distribution across multiple physical servers similar to
 224 - VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
 225 - .
 226 - This package contains utilities that are useful to diagnose
 227 - performance and connectivity issues in Open vSwitch setup.
 228 -
 229 -Package: openvswitch-vtep
 230 -Architecture: linux-any
 231 -Depends: openvswitch-common (>= ${binary:Version}),
 232 -         openvswitch-switch (>= ${binary:Version}),
 233 -         python,
 234 -         python-openvswitch (>= ${source:Version}),
 235 -         ${misc:Depends},
 236 -         ${shlibs:Depends}
 237 -Description: Open vSwitch VTEP utilities
 238 - Open vSwitch is a production quality, multilayer, software-based, Ethernet
 239 - virtual switch. It is designed to enable massive network automation through
 240 - programmatic extension, while still supporting standard management interfaces
 241 - and protocols (e.g. NetFlow, sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In
 242 - addition, it is designed to support distribution across multiple physical
 243 - servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus
 244 - 1000V.
 245 - .
 246 - This package provides utilities that are useful to interact with a
 247 - VTEP-configured database and a VTEP emulator.
 248 -
 249 -Package: openvswitch-dev
 250 -Architecture: linux-any
 251 -Depends:
 252 - openvswitch-common (>= ${binary:Version}),
 253 - ${misc:Depends}
 254 -Description: Open vSwitch development package
 255 - Open vSwitch is a production quality, multilayer, software-based, Ethernet
 256 - virtual switch. It is designed to enable massive network automation through
 257 - programmatic extension, while still supporting standard management interfaces
 258 - and protocols (e.g. NetFlow, sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In
 259 - addition, it is designed to support distribution across multiple physical
 260 - servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus
 261 - 1000V.
 262 - .
 263 - This package provides openvswitch headers and libopenvswitch for developers.
 264 Index: devel/debian/rules
 265 ===================================================================
 266 --- devel.orig/debian/rules
 267 +++ devel/debian/rules
 268 @@ -12,7 +12,6 @@
 269  #export DH_VERBOSE=1
 270
 271  PACKAGE=openvswitch
 272 -PACKAGE_DKMS=openvswitch-datapath-dkms
 273  DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+:)?([0-9][a-zA-Z0-9.+:~-]*)(-[a-zA-Z0-9*.~]*),\2,p')
 274
 275  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 276 @@ -53,39 +52,6 @@ override_dh_install:
 277         # openvswitch-switch
 278         cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
 279
 280 -       # ovn-host
 281 -       cp debian/ovn-host.template debian/ovn-host/usr/share/ovn/host/default.template
 282 -
 283 -       # ovn-central
 284 -       cp debian/ovn-central.template debian/ovn-central/usr/share/ovn/central/default.template
 285 -
 286 -       # openvswitch-datapath-source
 287 -       cp debian/rules.modules debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 288 -       chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 289 -       cd debian/openvswitch-datapath-source/usr/src && tar -c modules | bzip2 -9 > openvswitch-datapath.tar.bz2 && rm -rf modules
 290 -
 291 -       # openvswitch-datapath-dkms
 292 -       # setup the dirs
 293 -       dh_installdirs -p$(PACKAGE_DKMS) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)
 294 -
 295 -       # copy the source
 296 -       cd debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION) && tar xvzf $(CURDIR)/openvswitch.tar.gz && mv openvswitch/* openvswitch/.[a-z]* . && rmdir openvswitch
 297 -
 298 -       # check we can get kernel module names
 299 -       $(MAKE) -C datapath print-build-modules
 300 -
 301 -       # Prepare dkms.conf from the dkms.conf.in template
 302 -       sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g; s/__MODULES__/$(shell $(MAKE) -C datapath print-build-modules | grep -v make)/" debian/dkms.conf.in > debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf
 303 -
 304 -       # We don't need the debian folder in there, just upstream sources...
 305 -       rm -rf debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 306 -       # We don't need the rhel stuff in there either
 307 -       rm -rf debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/rhel
 308 -       # And we should also clean useless license files, which are already
 309 -       # described in our debian/copyright anyway.
 310 -       rm -f debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/COPYING \
 311 -               debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/xenserver/LICENSE
 312 -
 313  override_dh_installinit:
 314         dh_installinit -R
 315