diff options
| author |   Claudius Heine <ch@denx.de> | 2022-03-09 13:05:26 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-10 13:06:22 +0000 |
| commit | c577382c6d155b3a784d06e4c916783cde7165c8 (patch) | |
| tree | a56d9f089c10f9f23c1b1ce1009e599040668c66 /meta/classes | |
| parent | d19166cbc567be0803eaf8d0a2a20f44758aae7b (diff) | |
| download | openembedded-core-contrib-c577382c6d155b3a784d06e4c916783cde7165c8.tar.gz | |
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 <ch@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/overlayfs-etc.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 ??= "" |