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:07:38 +0000 |
| commit | 579ae7a45a4ec9d333a8daa9794d23eee450983e (patch) | |
| tree | a108376c9d143da73ee102c21406b881d77a516b | |
| parent | 9633ecebb98eaf6d588564d05f7ec5b45f3bdf5a (diff) | |
| download | poky-579ae7a45a4ec9d333a8daa9794d23eee450983e.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`.
(From OE-Core rev: c577382c6d155b3a784d06e4c916783cde7165c8)
Signed-off-by: Claudius Heine <ch@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ | |||
| 26 | # overlay is out of scope of this class | 26 | # overlay is out of scope of this class |
| 27 | 27 | ||
| 28 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "overlayfs-etc", "create_overlayfs_etc_preinit;", "", d)}' | 28 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "overlayfs-etc", "create_overlayfs_etc_preinit;", "", d)}' |
| 29 | IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "package-management" | 29 | IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "${@ 'package-management' if bb.utils.to_boolean(d.getVar('OVERLAYFS_ETC_USE_ORIG_INIT_NAME'), True) else ''}" |
| 30 | 30 | ||
| 31 | OVERLAYFS_ETC_MOUNT_POINT ??= "" | 31 | OVERLAYFS_ETC_MOUNT_POINT ??= "" |
| 32 | OVERLAYFS_ETC_FSTYPE ??= "" | 32 | OVERLAYFS_ETC_FSTYPE ??= "" |