From 968b06c60074227c45643449275824b3fd811118 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Tue, 23 Nov 2021 12:31:45 -0500 Subject: Revert "sysvinit: sync bbappend to 3.0" This reverts commit aa46581a4573a0bc5c8a52b265953a45ec70f6d6. 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, 5 insertions(+), 1 deletion(-) create mode 100644 recipes-core/sysvinit/sysvinit_2.9%.bbappend delete 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 new file mode 100644 index 0000000..4ec2267 --- /dev/null +++ b/recipes-core/sysvinit/sysvinit_2.9%.bbappend @@ -0,0 +1 @@ +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 deleted file mode 100644 index 4ec2267..0000000 --- a/recipes-core/sysvinit/sysvinit_3.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -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 1bdca98..480bde7 100644 --- a/recipes-core/sysvinit/sysvinit_selinux.inc +++ b/recipes-core/sysvinit/sysvinit_selinux.inc @@ -1,3 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +B = "${S}" + inherit selinux DEPENDS += "${LIBSELINUX}" -- cgit v1.2.3-54-g00ecf