MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: drop LSB bits

Browse Source 
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 <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Mark Asselstine 2019-09-12 15:55:31 -04:00 committed by Bruce Ashfield
parent af40c87298
commit ab382e2453
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
recipes-networking/openvswitch/files/openvswitch-testcontroller
View File

@ -40,7 +40,7 @@ PIDFILE=/var/run/openvswitch/$NAME.pid
test -x $DAEMON || exit 0 test -x $DAEMON || exit 0
. /lib/lsb/init-functions . /usr/share/openvswitch/scripts/ovs-lib
# Default options, these can be overriden by the information # Default options, these can be overriden by the information
# at /etc/default/openvswitch-testcontroller # at /etc/default/openvswitch-testcontroller
@ -89,6 +89,14 @@ running_pid() {
return 0 return 0
} }
log_begin_msg () {
echo "$@"
}
log_end_msg () {
echo "$@"
}
running() { running() {
# Check if the process is running looking at /proc # Check if the process is running looking at /proc
# (works for all users) # (works for all users)

2
recipes-networking/openvswitch/openvswitch.inc
View File

@ -16,7 +16,7 @@ DEPENDS += "bridge-utils openssl python3 perl python3-six-native coreutils-nativ
RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \
python3 perl perl-module-strict ${PN}-switch \ python3 perl perl-module-strict ${PN}-switch \
bash python3-twisted python3-six" 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}-switch = "${PN} openssl procps util-linux-uuidgen"
RDEPENDS_${PN}-pki = "${PN}" RDEPENDS_${PN}-pki = "${PN}"
RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"