| Message ID | 20220310131329.1906537-2-ch@denx.de |
|---|---|
| State | Accepted, archived |
| Commit | c577382c6d155b3a784d06e4c916783cde7165c8 |
| Headers | show |
| Series | Patches and bugfixes for overlayfs | expand |
diff --git a/meta/classes/overlayfs-etc.bbclass b/meta/classes/overlayfs-etc.bbclass index 4ced07ba11..b593a4d9eb 100644 --- a/meta/classes/overlayfs-etc.bbclass +++ b/meta/classes/overlayfs-etc.bbclass @@ -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 ??= ""
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 <ch@denx.de> --- meta/classes/overlayfs-etc.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)