From f8ceec50af68650d6548738e5b5582e2b25424d7 Mon Sep 17 00:00:00 2001 From: Mike Looijmans Date: Thu, 17 Aug 2017 12:49:49 +0200 Subject: rootfs-postcommands.bbclass: Prevent linking testdata to itself testdata and testdata_link may point to the same file, in particular when IMAGE_LINK_NAME and IMAGE_NAME are equal. Check if this is the case before creating a symlink that points to itself and makes the next build fail. Signed-off-by: Mike Looijmans Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 498174a664..c194b264e0 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -298,7 +298,8 @@ python write_image_test_data() { searchString = "%s/"%(d.getVar("TOPDIR")).replace("//","/") export2json(d, testdata,searchString=searchString,replaceString="") - if os.path.lexists(testdata_link): - os.remove(testdata_link) - os.symlink(os.path.basename(testdata), testdata_link) + if testdata_link != testdata: + if os.path.lexists(testdata_link): + os.remove(testdata_link) + os.symlink(os.path.basename(testdata), testdata_link) } -- cgit 1.2.3-korg