Skip to contentSkip to conversation

overlayfs-etc: add condition to package-management feature conflict

PATCH Superseded Claudius Heine 1 participant 1 message Mar 9, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/overlayfs-etc.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/overlayfs-etc.bbclass +2 -1
index 4ced07ba11..bf107b67e7 100644
@@ -26,7 +26,8 @@
 # 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 ??= ""
Signature · 1 line
2.33.1