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:17:32 +0000 |
| commit | 7f1f3e6b6db9a50f5e68bc8dff95549e692153b1 (patch) | |
| tree | 10f42ad89e8201fa5547cabe13e095a377acd157 /meta | |
| parent | 919613c0e75362ee0eace99b51cc77d34a05372f (diff) | |
| download | openembedded-core-7f1f3e6b6db9a50f5e68bc8dff95549e692153b1.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.
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/archive-configured-source.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/archive-original-source.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/archive-patched-source.bbclass | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass index 4fc5129c9d..2738cab9a5 100644 --- a/meta/classes/archive-configured-source.bbclass +++ b/meta/classes/archive-configured-source.bbclass @@ -28,9 +28,10 @@ python () { """ d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) build_deps = ' %s:do_archive_configured_sources' %pn - build_deps += ' %s:do_archive_scripts_logs' %pn + if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': + build_deps += ' %s:do_archive_scripts_logs' %pn + d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) d.appendVarFlag('do_build', 'depends', build_deps) - d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) else: d.prependVarFlag('do_configure', 'postfuncs', "do_archive_configured_sources") 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 () { """ d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) build_deps = ' %s:do_archive_original_sources_patches' %pn - build_deps += ' %s:do_archive_scripts_logs' %pn + if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': + build_deps += ' %s:do_archive_scripts_logs' %pn + d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) d.appendVarFlag('do_build', 'depends', build_deps) - d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) else: d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass index d7ed6c8785..b47d36cb09 100644 --- a/meta/classes/archive-patched-source.bbclass +++ b/meta/classes/archive-patched-source.bbclass @@ -28,9 +28,10 @@ python () { """ d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) build_deps = ' %s:do_archive_patched_sources' %pn - build_deps += ' %s:do_archive_scripts_logs' %pn + if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': + build_deps += ' %s:do_archive_scripts_logs' %pn + d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) d.appendVarFlag('do_build', 'depends', build_deps) - d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) else: d.prependVarFlag('do_patch', 'postfuncs', "do_archive_patched_sources") |