arm-autonomy/arm-autonomy-host-image-minimal: Resolve guest path if symlink
PATCH 1/1 arm-autonomy/arm-autonomy-host-image-minimal: Resolve guest path if symlink
In ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS, remove fatal error if guest path is a symlink, and instead resolve using os.path.realpath.
Issue-Id: SCM-638
Signed-off-by Nathan Dunne <[email protected]>
Change-Id Ic4fdd7ae03ed6bb6caa55e722b89114080c90f4c
--- .../images/arm-autonomy-host-image-minimal.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +8 -1
@@ -106,7 +106,14 @@ python add_extern_guests () { _, _, path, _, _, parm = bb.fetch.decodeurl(entry) if 'guestname' in parm: if os.path.islink(path): - bb.fatal("Guest file is a symlink: " + path) + realpath = os.path.realpath(path) + + if not os.path.exists(realpath): + bb.fatal("ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS link does not resolve: " + path) + + bb.note("Guest file is a symlink:\n " + path + "\nResolved to:\n " + realpath) + path = realpath + bb.utils.mkdirhier(guestdir) dstname = parm['guestname'] # Add file extension if not there
Signature · 1 line
2.17.1
Quoted 6 lines · Nathan Dunne
In
ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS, remove fatal error if guest path is a symlink, and instead resolve using os.path.realpath.Issue-Id: SCM-638
Signed-off-by Nathan Dunne <[email protected]>Change-Id Ic4fdd7ae03ed6bb6caa55e722b89114080c90f4c
Pulled into master.
Thanks,
Jon
Quoted 31 lines
--- .../images/arm-autonomy-host-image-minimal.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +8
-1@@ -106,7 +106,14 @@ python add_extern_guests () { _, _, path, _, _, parm = bb.fetch.decodeurl(entry) if 'guestname' in parm: if os.path.islink(path): - bb.fatal("Guest file is a symlink: " + path) + realpath = os.path.realpath(path) + + if not os.path.exists(realpath): + bb.fatal("ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS link does not resolve: " + path) + + bb.note("Guest file is a symlink:\n " + path + "\nResolved to:\n " + realpath) + path = realpath + bb.utils.mkdirhier(guestdir) dstname = parm['guestname'] # Add file extension if not thereSignature · 1 line
2.17.1