[meta-cgl,2/2] ocfs2-tools: Remove lsb from RDEPENDS

Submitted by changqing.li@windriver.com on Sept. 17, 2019, 8:04 a.m. | Patch ID: 165051

Details

Message ID 1568707486-382596-2-git-send-email-changqing.li@windriver.com
State New
Headers show

Commit Message

changqing.li@windriver.com Sept. 17, 2019, 8:04 a.m.
From: Changqing Li <changqing.li@windriver.com>

The lsb had been removed from oe-core, and the "systemctl start o2cb/ocfs2"
works well after patched, when systemd (no /etc/init.d/functions, either), so
remove the unneeded line.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...sh-Remove-unneeded-lib-lsb-init-functions.patch | 32 ++++++++++++++++++++++
 .../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb   |  7 ++---
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch

Patch hide | download patch | download mbox

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 <liezhi.yang@windriver.com>
+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 <liezhi.yang@windriver.com>
+---
+ 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.5.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
index a0376ec..d64c868 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
@@ -21,6 +21,7 @@  SRC_URI = "git://github.com/markfasheh/ocfs2-tools \
     file://ocfs2.service \
     file://0001-Fix-build-with-glibc-2.28.patch \
     file://0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch \
+    file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \
 "
 SRCREV = "f1b4d073f08679f97b64b3eb88e586032f92a701"
 S = "${WORKDIR}/git"
@@ -32,11 +33,7 @@  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 chkconfig glib-2.0 \
-                  ${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}"
+RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs chkconfig glib-2.0"
 
 ASNEEDED_pn-${PN} = ""
 PARALLEL_MAKE = ""

Comments

changqing.li@windriver.com Nov. 11, 2019, 8:57 a.m.
ping

On 9/17/19 4:04 PM, changqing.li@windriver.com wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> The lsb had been removed from oe-core, and the "systemctl start o2cb/ocfs2"
> works well after patched, when systemd (no /etc/init.d/functions, either), so
> remove the unneeded line.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>   ...sh-Remove-unneeded-lib-lsb-init-functions.patch | 32 ++++++++++++++++++++++
>   .../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb   |  7 ++---
>   2 files changed, 34 insertions(+), 5 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 <liezhi.yang@windriver.com>
> +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 <liezhi.yang@windriver.com>
> +---
> + 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.5.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
> index a0376ec..d64c868 100644
> --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
> +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/markfasheh/ocfs2-tools \
>       file://ocfs2.service \
>       file://0001-Fix-build-with-glibc-2.28.patch \
>       file://0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch \
> +    file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \
>   "
>   SRCREV = "f1b4d073f08679f97b64b3eb88e586032f92a701"
>   S = "${WORKDIR}/git"
> @@ -32,11 +33,7 @@ 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 chkconfig glib-2.0 \
> -                  ${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}"
> +RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs chkconfig glib-2.0"
>   
>   ASNEEDED_pn-${PN} = ""
>   PARALLEL_MAKE = ""