diff options
-rw-r--r-- | meta/classes-recipe/overlayfs.bbclass | 6 | ||||
-rw-r--r-- | meta/lib/oe/overlayfs.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes-recipe/overlayfs.bbclass b/meta/classes-recipe/overlayfs.bbclass index bdc6dd9d57..53d65d7531 100644 --- a/meta/classes-recipe/overlayfs.bbclass +++ b/meta/classes-recipe/overlayfs.bbclass | |||
@@ -102,7 +102,11 @@ python do_create_overlayfs_units() { | |||
102 | overlayMountPoints = d.getVarFlags("OVERLAYFS_MOUNT_POINT") | 102 | overlayMountPoints = d.getVarFlags("OVERLAYFS_MOUNT_POINT") |
103 | for mountPoint in overlayMountPoints: | 103 | for mountPoint in overlayMountPoints: |
104 | bb.debug(1, "Process variable flag %s" % mountPoint) | 104 | bb.debug(1, "Process variable flag %s" % mountPoint) |
105 | for lower in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split(): | 105 | lowerList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint) |
106 | if not lowerList: | ||
107 | bb.note("No mount points defined for %s flag, skipping" % (mountPoint)) | ||
108 | continue | ||
109 | for lower in lowerList.split(): | ||
106 | bb.debug(1, "Prepare mount unit for %s with data mount point %s" % | 110 | bb.debug(1, "Prepare mount unit for %s with data mount point %s" % |
107 | (lower, d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint))) | 111 | (lower, d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint))) |
108 | prepareUnits(d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint), lower) | 112 | prepareUnits(d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint), lower) |
diff --git a/meta/lib/oe/overlayfs.py b/meta/lib/oe/overlayfs.py index 8d7a047125..8b88900f71 100644 --- a/meta/lib/oe/overlayfs.py +++ b/meta/lib/oe/overlayfs.py | |||
@@ -40,7 +40,11 @@ def unitFileList(d): | |||
40 | bb.fatal("Missing required mount point for OVERLAYFS_MOUNT_POINT[%s] in your MACHINE configuration" % mountPoint) | 40 | bb.fatal("Missing required mount point for OVERLAYFS_MOUNT_POINT[%s] in your MACHINE configuration" % mountPoint) |
41 | 41 | ||
42 | for mountPoint in overlayMountPoints: | 42 | for mountPoint in overlayMountPoints: |
43 | for path in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split(): | 43 | mountPointList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint) |
44 | if not mountPointList: | ||
45 | bb.debug(1, "No mount points defined for %s flag, don't add to file list", mountPoint) | ||
46 | continue | ||
47 | for path in mountPointList.split(): | ||
44 | fileList.append(mountUnitName(path)) | 48 | fileList.append(mountUnitName(path)) |
45 | fileList.append(helperUnitName(path)) | 49 | fileList.append(helperUnitName(path)) |
46 | 50 | ||