From ab382e2453d652181eb7a6fb4dcf201d4b33b94a Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 12 Sep 2019 15:55:31 -0400 Subject: openvswitch: drop LSB bits openembedded-core commit fb064356af61 [Remove LSB support] dropped the 'lsb' recipe which caused openvswitch to throw a dependency fail for both sysvinit and systemd builds. LSB init functions for log_begin_msg, log_end_msg and others were being used. We now use the functions from ovs-lib which are part of OVS and supply the remaining ones directly. This allows us to regain the functionality and drop the dependency on 'lsb'. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../openvswitch/files/openvswitch-testcontroller | 10 +++++++++- recipes-networking/openvswitch/openvswitch.inc | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/files/openvswitch-testcontroller b/recipes-networking/openvswitch/files/openvswitch-testcontroller index aad5ad60..57c77983 100755 --- a/recipes-networking/openvswitch/files/openvswitch-testcontroller +++ b/recipes-networking/openvswitch/files/openvswitch-testcontroller @@ -40,7 +40,7 @@ PIDFILE=/var/run/openvswitch/$NAME.pid test -x $DAEMON || exit 0 -. /lib/lsb/init-functions +. /usr/share/openvswitch/scripts/ovs-lib # Default options, these can be overriden by the information # at /etc/default/openvswitch-testcontroller @@ -89,6 +89,14 @@ running_pid() { return 0 } +log_begin_msg () { + echo "$@" +} + +log_end_msg () { + echo "$@" +} + running() { # Check if the process is running looking at /proc # (works for all users) diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc index 46865bd1..37fbe5ab 100644 --- a/recipes-networking/openvswitch/openvswitch.inc +++ b/recipes-networking/openvswitch/openvswitch.inc @@ -16,7 +16,7 @@ DEPENDS += "bridge-utils openssl python3 perl python3-six-native coreutils-nativ RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ python3 perl perl-module-strict ${PN}-switch \ bash python3-twisted python3-six" -RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki" +RDEPENDS_${PN}-testcontroller = "${PN} ${PN}-pki" RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" RDEPENDS_${PN}-pki = "${PN}" RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" -- cgit v1.2.3-54-g00ecf