diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2015-07-16 16:23:03 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-22 23:25:02 +0100 |
| commit | dc70cf470f18c97b6762cbf7aca723769b47bc7d (patch) | |
| tree | 45add65a7f99341c84f7bf546cb69ad75c23ae2b | |
| parent | fc174debb073c99a0cabf4f00e66ab36c7e93989 (diff) | |
| download | openembedded-core-dc70cf470f18c97b6762cbf7aca723769b47bc7d.tar.gz openembedded-core-dc70cf470f18c97b6762cbf7aca723769b47bc7d.tar.bz2 openembedded-core-dc70cf470f18c97b6762cbf7aca723769b47bc7d.zip | |
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@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/recipetool/append.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index ed4af2054a..3f2f9a4f4f 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) |