openvswitch: rename openvswitch-controller

As of version 2.4.0 openvswitch-controller has been renamed to
openvswitch-testcontroller. This was documented in the upstream 'NEWS':

   - test-controller has been renamed ovs-testcontroller at request of users
     who find it useful for testing basic OpenFlow setups.  It is still not
     a necessary or desirable part of most Open vSwitch deployments.

Our initscripts and such have continued to reference the old name
despite the application name name changing and so
openvswitch-controller packaging has been broken for some time now.

We rename the openvswitch-controller package to reflect the upstream
name change and apply  this name change throughout. We also drop the
RDEPENDS as the upstream comments also indicate that this package is
not needed for a normal openvswitch deployment.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 18 insertions, 18 deletions

diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 454aadf0..13c7d062 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -14,9 +14,9 @@ LICENSE = "Apache-2"
 DEPENDS += "bridge-utils openssl python perl"
 
 RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \
-        python perl perl-module-strict ${PN}-switch ${PN}-controller \
+        python perl perl-module-strict ${PN}-switch \
         bash"
-RDEPENDS_${PN}-controller = "${PN} lsb ${PN}-pki"
+RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki"
 RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen"
 RDEPENDS_${PN}-pki = "${PN}"
 RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
@@ -29,8 +29,8 @@ RDEPENDS_${PN} += "sed gawk grep"
 SRC_URI = "\
         file://openvswitch-switch \
         file://openvswitch-switch-setup \
-        file://openvswitch-controller \
-        file://openvswitch-controller-setup \
+        file://openvswitch-testcontroller \
+        file://openvswitch-testcontroller-setup \
         file://openvswitch-add-target-python-handling.patch \
         file://openvswitch-add-target-perl-handling.patch \
         "
@@ -47,13 +47,13 @@ CONFIGUREOPT_DEPTRACK = ""
 # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}"
 
 ALLOW_EMPTY_${PN}-pki = "1"
-PACKAGES =+ "${PN}-controller ${PN}-switch ${PN}-brcompat ${PN}-pki"
+PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki"
 
-FILES_${PN}-controller = "\
-        ${sysconfdir}/init.d/openvswitch-controller \
-        ${sysconfdir}/default/openvswitch-controller \
-        ${sysconfdir}/openvswitch-controller \
-        ${bindir}/ovs-controller \
+FILES_${PN}-testcontroller = "\
+        ${sysconfdir}/init.d/openvswitch-testcontroller \
+        ${sysconfdir}/default/openvswitch-testcontroller \
+        ${sysconfdir}/openvswitch-testcontroller \
+        ${bindir}/ovs-testcontroller \
         "
 
 FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd"
@@ -69,21 +69,21 @@ FILES_${PN} += "/run"
 
 inherit autotools update-rc.d
 
-INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller"
+INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller"
 INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch"
 INITSCRIPT_PARAMS_${PN}-switch = "defaults 71"
 
-INITSCRIPT_NAME_${PN}-controller = "openvswitch-controller"
-INITSCRIPT_PARAMS_${PN}-controller = "defaults 72"
+INITSCRIPT_NAME_${PN}-testcontroller = "openvswitch-testcontroller"
+INITSCRIPT_PARAMS_${PN}-testcontroller = "defaults 72"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/default/
         install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
-        install -d ${D}/${sysconfdir}/openvswitch-controller
-        install -m 660 ${WORKDIR}/openvswitch-controller-setup ${D}/${sysconfdir}/default/openvswitch-controller
+        install -d ${D}/${sysconfdir}/openvswitch-testcontroller
+        install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
 
         install -d ${D}/${sysconfdir}/init.d/
-        install -m 755 ${WORKDIR}/openvswitch-controller ${D}/${sysconfdir}/init.d/openvswitch-controller
+        install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
         install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
         true || rm -fr ${D}/${datadir}/${PN}/pki
 
@@ -102,7 +102,7 @@ pkg_postinst_${PN}-pki () {
         fi
 }
 
-pkg_postinst_${PN}-controller () {
+pkg_postinst_${PN}-testcontroller () {
         # can't do this offline
         if [ "x$D" != "x" ]; then
                 exit 1
@@ -112,7 +112,7 @@ pkg_postinst_${PN}-controller () {
                 ovs-pki init --dir=$D/${datadir}/${PN}/pki
         fi
 
-        cd $D/${sysconfdir}/openvswitch-controller
+        cd $D/${sysconfdir}/openvswitch-testcontroller
         if ! test -e cacert.pem; then
                 ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem
         fi