From 75be860f340504d4368a9f59259bc8d6685735de Mon Sep 17 00:00:00 2001 From: Vyacheslav Yurkov Date: Wed, 5 Oct 2022 13:14:02 +0200 Subject: overlayfs: Allow not used mount points When machine configuration defines a mount point, which is not used in any recipe, allow to fall through and only report a note in the logs. This can be expected behavior, when a mount point is defined for several machines, but not used in all of them (From OE-Core rev: 89d83920dc7f80abb20fadde97b47aba9cd992cc) Signed-off-by: Vyacheslav Yurkov Signed-off-by: Luca Ceresoli (cherry picked from commit a9c604b5e0d943b5b5f7c8bdd5be730c2abcf866) Signed-off-by: Steve Sakoman (cherry picked from commit c7c6b273656a3e2b8b959004b996e56d4086ce5e) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oe/overlayfs.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/overlayfs.py b/meta/lib/oe/overlayfs.py index b5d5e88e80..590c0de58a 100644 --- a/meta/lib/oe/overlayfs.py +++ b/meta/lib/oe/overlayfs.py @@ -38,7 +38,11 @@ def unitFileList(d): bb.fatal("Missing required mount point for OVERLAYFS_MOUNT_POINT[%s] in your MACHINE configuration" % mountPoint) for mountPoint in overlayMountPoints: - for path in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split(): + mountPointList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint) + if not mountPointList: + bb.debug(1, "No mount points defined for %s flag, don't add to file list", mountPoint) + continue + for path in mountPointList.split(): fileList.append(mountUnitName(path)) fileList.append(helperUnitName(path)) -- cgit v1.2.3-54-g00ecf