From: Robert Yang <[email protected]> The LSB support had been removed from oe-core by:
https://git.openembedded.org/openembedded-core/commit/?id=fb06435 And it works well to start o2cb/ocfs2 services without lsbinitscripts. So drop LSB support for ocfs2-tools too. Signed-off-by: Robert Yang <[email protected]> Signed-off-by: Chen Qi <[email protected]> Signed-off-by: Kai Kang <[email protected]> --- ...move-unneeded-lib-lsb-init-functions.patch | 32 +++++++++++++++++++ .../ocfs2-tools/ocfs2-tools_1.8.6.bb | 5 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch new file mode 100644 index 0000000..5609b4b --- /dev/null +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch @@ -0,0 +1,32 @@ +From b7913a62e2d78fa98ae2c475de4cc697519181e2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Tue, 10 Sep 2019 19:29:16 -0700 +Subject: [PATCH] o2cb.init.sh: Remove unneeded /lib/lsb/init-functions + +The "systemctl start o2cb/ocfs2" works well when systemd (no +/etc/init.d/functions, either), so remove the unneeded line. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + vendor/common/o2cb.init.sh | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh +index 8b0dbf09..49eb9a4c 100755 +--- a/vendor/common/o2cb.init.sh ++++ b/vendor/common/o2cb.init.sh +@@ -25,9 +25,6 @@ then + start_daemon () { + daemon $* + } +-else +-# Let's try to use the LSB functions +-. /lib/lsb/init-functions + fi + + if [ $? != 0 ] +-- +2.21.0 + diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb index bc0551b..81e6c2e 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/markfasheh/ocfs2-tools \ file://o2cb.service \ file://ocfs2.service \ file://0001-Fix-build-with-glibc-2.28.patch \ + file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \ " SRCREV = "4d76ceb4aa7aaa1fd595368089e99575d708f719" S = "${WORKDIR}/git" @@ -30,11 +31,11 @@ DEPENDS = "corosync pacemaker \ e2fsprogs e2fsprogs-native \ " + # lsbinitscripts are needed to replace /etc/init.d/functions supplied by initscripts (systemv) # They are not the same code! # -RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0 \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}" +RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0" ASNEEDED_pn-${PN} = "" PARALLEL_MAKE = "" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#50837): https://lists.yoctoproject.org/g/yocto/message/50837 Mute This Topic: https://lists.yoctoproject.org/mt/77151896/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
