[oe-commits] Christopher Larson : recipetool: appendsrcfile: handle S == STAGING_KERNEL_DIR
git at git.openembedded.org
git at git.openembedded.org
Wed Jul 22 22:20:38 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 9c0add9a972b640af39c44c281ef641c2c51994f
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9c0add9a972b640af39c44c281ef641c2c51994f
Author: Christopher Larson <chris_larson at mentor.com>
Date: Thu Jul 16 16:23:03 2015 -0700
recipetool: appendsrcfile: handle S == STAGING_KERNEL_DIR
When determining the path from WORKDIR to the extracted sources, we're using
S, but if S is in work-shared, that's problematic and won't give us good
results, so assume 'git' for that case, warning when appropriate.
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/recipetool/append.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index ed4af20..3f2f9a4 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -356,6 +356,10 @@ def appendsrc(args, files, rd):
for newfile, srcfile in files.iteritems():
src_destdir = os.path.dirname(srcfile)
if not args.use_workdir:
+ if rd.getVar('S', True) == rd.getVar('STAGING_KERNEL_DIR', True):
+ srcdir = os.path.join(workdir, 'git')
+ if not bb.data.inherits_class('kernel-yocto', rd):
+ logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
src_destdir = os.path.normpath(src_destdir)
More information about the Openembedded-commits
mailing list