openvswitch: remove ovs-controller package

According to the NEWS message from the main OVS site:
    http://openvswitch.org/releases/NEWS-2.3.0

Excerpt:
 - ovs-controller has been renamed test-controller.  It is no longer
   packaged or installed by default, because too many users assumed
   incorrectly that ovs-controller was a necessary or desirable part
   of an Open vSwitch deployment.

Current feed was updated based on a feed that packaged OVS 1.9,
and subsequently updated.

For now, we'll remove it, since it's not required.
When I tested the feed, I tested it on a setup that has been configured
some time ago, and does not have that package enabled.

So, I'll remove it to prevent confusion.

Signed-off-by: Alexandru Ardelean ardeleanalex@gmail.com

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 8935b01c4bc69dfd302ad9316f2646da46a6385b..1ac882632f51b795e3b0ad955ef74ce0bfae31ba 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -53,8 +53,7 @@ define Package/openvswitch-common
 endef
 
 define Package/openvswitch-common/description
-  openvswitch-common provides components required by both openvswitch-switch and
-  openvswitch-controller.
+  openvswitch-common provides components required by openvswitch-switch. 
 endef
 
 define Package/openvswitch-ipsec
@@ -78,17 +77,6 @@ define Package/openvswitch-benchmark/description
   Utility for running OpenVSwitch benchmarking
 endef
 
-define Package/openvswitch-controller
-  $(call Package/openvswitch/Default)
-  TITLE:=Open vSwitch Userspace Package
-  DEPENDS:=+openvswitch-common
-endef
-
-define Package/openvswitch-controller/description
-  The Open vSwitch controller enables OpenFlow switches that connect to it to
-  act as MAC-learning Ethernet switches.
-endef
-
 define Package/openvswitch-switch
   $(call Package/openvswitch/Default)
   TITLE:=Open vSwitch Userspace Package
@@ -179,11 +167,6 @@ define Package/openvswitch-common/postinst
 [ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true
 endef
 
-define Package/openvswitch-controller/install
-       $(INSTALL_DIR) $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-controller $(1)/usr/bin/
-endef
-
 define Package/openvswitch-switch/install
        $(INSTALL_DIR) $(1)/usr/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-dpctl $(1)/usr/bin/
@@ -200,7 +183,6 @@ endef
 
 $(eval $(call BuildPackage,openvswitch-ipsec))
 $(eval $(call BuildPackage,openvswitch-common))
-$(eval $(call BuildPackage,openvswitch-controller))
 $(eval $(call BuildPackage,openvswitch-switch))
 $(eval $(call BuildPackage,openvswitch-benchmark))
 $(eval $(call KernelPackage,openvswitch))