With previous implementation, several packages provided
.autorelabel file while only selinux-autorelabel manage it.
If there is several packages which try to install .autorelabel
file, an issue occur during installation of packagegroup-core-selinux.
Signed-off-by: Christophe Priouzeau <christophe.priouz...@st.com>
---
recipes-security/selinux/selinux-autorelabel_0.1.bb | 9 +++++++++
recipes-security/selinux/selinux-initsh.inc | 7 -------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/recipes-security/selinux/selinux-autorelabel_0.1.bb
b/recipes-security/selinux/selinux-autorelabel_0.1.bb
index 4eb2b4e..7e7d08c 100644
--- a/recipes-security/selinux/selinux-autorelabel_0.1.bb
+++ b/recipes-security/selinux/selinux-autorelabel_0.1.bb
@@ -18,3 +18,12 @@ SRC_URI = "file://${BPN}.sh \
INITSCRIPT_PARAMS = "start 01 S ."
require selinux-initsh.inc
+
+do_install_append() {
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh
${D}${bindir}
+ sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh
+ echo "# first boot relabelling" > ${D}/.autorelabel
+ fi
+}
diff --git a/recipes-security/selinux/selinux-initsh.inc
b/recipes-security/selinux/selinux-initsh.inc
index 8e31cda..6084762 100644
--- a/recipes-security/selinux/selinux-initsh.inc
+++ b/recipes-security/selinux/selinux-initsh.inc
@@ -29,13 +29,6 @@ do_install () {
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service
${D}${systemd_unitdir}/system
-
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh
${D}${bindir}
- sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh
- echo "# first boot relabelling" > ${D}/.autorelabel
- fi
}
sysroot_stage_all_append () {
--
2.17.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
