diff options
author | Saul Wold <sgw@linux.intel.com> | 2016-10-10 11:32:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-08 23:47:12 +0000 |
commit | 8f5becc3aba0947a37d1a7d844f44d3ff8ef39dd (patch) | |
tree | eb3cc8d70d7d879bbaba886f06b5e7f057f9d397 /meta | |
parent | 732dd581f3e66175feccd811bc2ef9f814ee0705 (diff) | |
download | poky-8f5becc3aba0947a37d1a7d844f44d3ff8ef39dd.tar.gz |
archiver: fix gcc-source handling
The source archiver was not handling the gcc-source target correctly, since it uses the
work-shared directory, we don't want to unpack and patch it twice, just as the comments
say, but the code was not there to check for the gcc-source target.
[YOCTO #10265]
(From OE-Core rev: bbac0699ceadb7a25a60643fb23dffce8b4d23d0)
(From OE-Core rev: 7c83d20fe48064df2200f4aa9e7c7d772b69f574)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/archiver.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 2f3b278fb3..7b90025fb5 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -270,9 +270,10 @@ python do_unpack_and_patch() { | |||
270 | return | 270 | return |
271 | ar_outdir = d.getVar('ARCHIVER_OUTDIR', True) | 271 | ar_outdir = d.getVar('ARCHIVER_OUTDIR', True) |
272 | ar_workdir = d.getVar('ARCHIVER_WORKDIR', True) | 272 | ar_workdir = d.getVar('ARCHIVER_WORKDIR', True) |
273 | pn = d.getVar('PN', True) | ||
273 | 274 | ||
274 | # The kernel class functions require it to be on work-shared, so we dont change WORKDIR | 275 | # The kernel class functions require it to be on work-shared, so we dont change WORKDIR |
275 | if not bb.data.inherits_class('kernel-yocto', d): | 276 | if not (bb.data.inherits_class('kernel-yocto', d) or pn.startswith('gcc-source')): |
276 | # Change the WORKDIR to make do_unpack do_patch run in another dir. | 277 | # Change the WORKDIR to make do_unpack do_patch run in another dir. |
277 | d.setVar('WORKDIR', ar_workdir) | 278 | d.setVar('WORKDIR', ar_workdir) |
278 | 279 | ||
@@ -290,7 +291,7 @@ python do_unpack_and_patch() { | |||
290 | oe.path.copytree(src, src_orig) | 291 | oe.path.copytree(src, src_orig) |
291 | 292 | ||
292 | # Make sure gcc and kernel sources are patched only once | 293 | # Make sure gcc and kernel sources are patched only once |
293 | if not ((d.getVar('SRC_URI', True) == "" or bb.data.inherits_class('kernel-yocto', d))): | 294 | if not (d.getVar('SRC_URI', True) == "" or (bb.data.inherits_class('kernel-yocto', d) or pn.startswith('gcc-source'))): |
294 | bb.build.exec_func('do_patch', d) | 295 | bb.build.exec_func('do_patch', d) |
295 | 296 | ||
296 | # Create the patches | 297 | # Create the patches |