MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

overlayfs: Allow not used mount points

Browse Source 
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: a9c604b5e0d943b5b5f7c8bdd5be730c2abcf866)

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vyacheslav Yurkov 2022-10-05 13:14:02 +02:00 committed by Richard Purdie
parent 2cd51cfe99
commit 2eb933bb8c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes-recipe/overlayfs.bbclass
View File

@ -102,7 +102,11 @@ python do_create_overlayfs_units() {
overlayMountPoints = d.getVarFlags("OVERLAYFS_MOUNT_POINT")
for mountPoint in overlayMountPoints:
bb.debug(1, "Process variable flag %s" % mountPoint)
for lower in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split():
lowerList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint)
if not lowerList:
bb.note("No mount points defined for %s flag, skipping" % (mountPoint))
continue
for lower in lowerList.split():
bb.debug(1, "Prepare mount unit for %s with data mount point %s" %
(lower, d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint)))
prepareUnits(d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint), lower)

6
meta/lib/oe/overlayfs.py
View File

@ -40,7 +40,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))