From c577382c6d155b3a784d06e4c916783cde7165c8 Mon Sep 17 00:00:00 2001 From: Claudius Heine Date: Wed, 9 Mar 2022 13:05:26 +0100 Subject: [PATCH] overlayfs-etc: add condition to package-management feature conflict The conflict with the `package-managment` only happens if the `overlayfs-etc` class overwrites `/sbin/init`, which is not the case when `OVERLAYFS_ETC_USE_ORIG_INIT_NAME` is set to `0`. Signed-off-by: Claudius Heine Signed-off-by: Richard Purdie --- meta/classes/overlayfs-etc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/overlayfs-etc.bbclass b/meta/classes/overlayfs-etc.bbclass index 4ced07ba11..91afee695c 100644 --- a/meta/classes/overlayfs-etc.bbclass +++ b/meta/classes/overlayfs-etc.bbclass @@ -26,7 +26,7 @@ # overlay is out of scope of this class ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "overlayfs-etc", "create_overlayfs_etc_preinit;", "", d)}' -IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "package-management" +IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "${@ 'package-management' if bb.utils.to_boolean(d.getVar('OVERLAYFS_ETC_USE_ORIG_INIT_NAME'), True) else ''}" OVERLAYFS_ETC_MOUNT_POINT ??= "" OVERLAYFS_ETC_FSTYPE ??= "" -- 2.40.1