From 628b8bc19aaae0424c12e9f9051676059bc82fbb Mon Sep 17 00:00:00 2001 From: Nathan Dunne Date: Tue, 10 Nov 2020 13:41:52 +0000 Subject: [PATCH] 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 Change-Id: Ic4fdd7ae03ed6bb6caa55e722b89114080c90f4c Signed-off-by: Jon Mason --- .../images/arm-autonomy-host-image-minimal.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb index 188e31d6..47a07cd2 100644 --- a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +++ b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb @@ -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