From aa46581a4573a0bc5c8a52b265953a45ec70f6d6 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 26 Oct 2021 23:55:17 +0800 Subject: sysvinit: sync bbappend to 3.0 The sysvinit in oe-core has been upgraded to 3.0. Update the bbappend to adapt it. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- recipes-core/sysvinit/sysvinit_2.9%.bbappend | 1 - recipes-core/sysvinit/sysvinit_3.%.bbappend | 1 + recipes-core/sysvinit/sysvinit_selinux.inc | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 recipes-core/sysvinit/sysvinit_2.9%.bbappend create mode 100644 recipes-core/sysvinit/sysvinit_3.%.bbappend diff --git a/recipes-core/sysvinit/sysvinit_2.9%.bbappend b/recipes-core/sysvinit/sysvinit_2.9%.bbappend deleted file mode 100644 index 4ec2267..0000000 --- a/recipes-core/sysvinit/sysvinit_2.9%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'sysvinit_selinux.inc', '', d)} diff --git a/recipes-core/sysvinit/sysvinit_3.%.bbappend b/recipes-core/sysvinit/sysvinit_3.%.bbappend new file mode 100644 index 0000000..4ec2267 --- /dev/null +++ b/recipes-core/sysvinit/sysvinit_3.%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'sysvinit_selinux.inc', '', d)} diff --git a/recipes-core/sysvinit/sysvinit_selinux.inc b/recipes-core/sysvinit/sysvinit_selinux.inc index 480bde7..1bdca98 100644 --- a/recipes-core/sysvinit/sysvinit_selinux.inc +++ b/recipes-core/sysvinit/sysvinit_selinux.inc @@ -1,7 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -B = "${S}" - inherit selinux DEPENDS += "${LIBSELINUX}" -- cgit v1.2.3-54-g00ecf