summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-02 16:48:24 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:36 +0000
commit385f1083776f71ab03690e3ab1f94782b17589b0 (patch)
treeecb804a6ef152e30133871ab2acf8273e68efcd8
parent98417f180537affbdc7b32e51ebd96a780a86024 (diff)
downloadpoky-385f1083776f71ab03690e3ab1f94782b17589b0.tar.gz
lib/oe/recipeutils: print just filename in bbappend_recipe() if in temp dir
If you use devtool update-recipe with the --append option, and a "local" (in oe-local-files) has been modified we copy it into the specified destination layer. With the way the devtool update-recipe code works now the source is always a temp directory, and printing paths from within that is just confusing, so if the path starts with the temp directory then just print the file name alone. (From OE-Core rev: 61475f0267d40c618ebf36023d0b6414a25975cb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/recipeutils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 58e4028aed..6caae5f7d4 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -786,7 +786,11 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
786 for newfile, srcfile in copyfiles.items(): 786 for newfile, srcfile in copyfiles.items():
787 filedest = os.path.join(appenddir, destsubdir, os.path.basename(srcfile)) 787 filedest = os.path.join(appenddir, destsubdir, os.path.basename(srcfile))
788 if os.path.abspath(newfile) != os.path.abspath(filedest): 788 if os.path.abspath(newfile) != os.path.abspath(filedest):
789 bb.note('Copying %s to %s' % (newfile, filedest)) 789 if newfile.startswith(tempfile.gettempdir()):
790 newfiledisp = os.path.basename(newfile)
791 else:
792 newfiledisp = newfile
793 bb.note('Copying %s to %s' % (newfiledisp, filedest))
790 bb.utils.mkdirhier(os.path.dirname(filedest)) 794 bb.utils.mkdirhier(os.path.dirname(filedest))
791 shutil.copyfile(newfile, filedest) 795 shutil.copyfile(newfile, filedest)
792 796