From 9ef8ce5277326cb8c859fac1a42cb7f48647ca8b Mon Sep 17 00:00:00 2001 From: Kevin Strasser Date: Mon, 11 Mar 2013 15:51:22 -0700 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/archive-configured-source.bbclass | 5 +++-- meta/classes/archive-original-source.bbclass | 5 +++-- 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 4fc5129..2738cab 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 3aea4f4..2858d33 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 d7ed6c8..b47d36c 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") -- 2.7.4