kernel: Remove non-existing kernel option
PATCH 1/3 kernel: Remove non-existing kernel option
From: He Zhe <[email protected]>
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE has been removed from mainline kernel by commit be6ec88f41ba ("selinux: Remove SECURITY_SELINUX_BOOTPARAM_VALUE").
Ref:
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto/commit/?id=be6ec88
--- meta-cgl-common/recipes-kernel/linux/files/cfg/00014-selinux.cfg | 1 - 1 file changed, 1 deletion(-)
meta-cgl-common/recipes-kernel/linux/files/cfg/00014-selinux.cfg +0 -1
@@ -19,7 +19,6 @@ CONFIG_REISERFS_FS_SECURITY=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y
Signature · 1 line
2.17.1
PATCH 2/3 ocfs2-tools: remove lsbinitscripts from RDEPENDS
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.
--- ...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
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch new file +32 -0
@@ -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 +
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb +3 -2
@@ -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 = ""
Signature · 1 line
2.17.1
PATCH 3/3 ucarp: add initscripts-functions as runtime dependency when using systemd
In reply to kaiFrom: Yi Zhao <[email protected]>
The ucarp.service invokes script /usr/libexec/ucarp to start/stop the ucarp service. But the /etc/init.d/functions file which is required by the script is not installed by default when using systemd. Explicitly set the initscripts-functions package as the runtime dependency when using systemd.
--- meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb | 1 + 1 file changed, 1 insertion(+)
meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb +1 -0
@@ -31,6 +31,7 @@ SRC_URI[sha256sum] = "f3cc77e28481fd04f62bb3d4bc03104a97dd316c80c0ed04ad7be24b54 inherit autotools gettext systemd DEPENDS = "libpcap" +RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','initscripts-functions','',d)}" SYSTEMD_SERVICE_${PN} = "ucarp.service" SYSTEMD_AUTO_ENABLE = "disable"
Signature · 1 line
2.17.1