diff options
author | Kevin Strasser <kevin.strasser@linux.intel.com> | 2013-03-11 15:51:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:18:21 +0000 |
commit | 6b8ed0660fad4c4229bf991968ac98b8c715b3a8 (patch) | |
tree | 69005dbfe2157c6212c9d3ebd8bd2d7929e235a7 /meta/classes/archive-original-source.bbclass | |
parent | 354bb63f024559392b525c9ef6c6b43bc8ff41ee (diff) | |
download | poky-6b8ed0660fad4c4229bf991968ac98b8c715b3a8.tar.gz |
archive-*-source.bbclass: fix scripts_with_logs build error
Log and script archives are only generated when explicitly enabled by
setting the environment variable SOURCE_ARCHIVE_LOG_WITH_SCRIPTS to
'logs_with_scripts'. When left disabled, the path specified to be
handled by sstate is never created, resulting in a build error.
Only attempt to archive scripts and logs when explicitly enabled.
(From OE-Core rev: 7f1f3e6b6db9a50f5e68bc8dff95549e692153b1)
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/archive-original-source.bbclass')
-rw-r--r-- | meta/classes/archive-original-source.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 3aea4f468f..2858d33876 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass | |||
@@ -28,9 +28,10 @@ python () { | |||
28 | """ | 28 | """ |
29 | d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) | 29 | d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) |
30 | build_deps = ' %s:do_archive_original_sources_patches' %pn | 30 | build_deps = ' %s:do_archive_original_sources_patches' %pn |
31 | build_deps += ' %s:do_archive_scripts_logs' %pn | 31 | if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': |
32 | build_deps += ' %s:do_archive_scripts_logs' %pn | ||
33 | d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) | ||
32 | d.appendVarFlag('do_build', 'depends', build_deps) | 34 | d.appendVarFlag('do_build', 'depends', build_deps) |
33 | d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) | ||
34 | 35 | ||
35 | else: | 36 | else: |
36 | d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") | 37 | d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") |