From 34f819e22e337c3ad69f72a9bd9c4422d5a61c3a Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Wed, 30 May 2012 17:03:56 +0800 Subject: archiver.bbclass: Improve the usability for the archiver classes The usability of the archiver classes can be improved, beyond the simple addition of default values for the variables. A user could well inherit just archiver rather than the individual useful classes, and not realize it will do nothing. [YOCTO #2472] (From OE-Core rev: ce91f495e0c4ef3bf53ee8b2ea570061da38e14f) Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- meta/classes/archiver.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 67eac84314..ed2dbe4ed8 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -6,8 +6,10 @@ ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache" ARCHIVE_TYPE ?= "TAR SRPM" DISTRO ?= "poky" PATCHES_ARCHIVE_WITH_SERIES = 'TRUE' -SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs_with_scripts' -SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar' +SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= '${@d.getVarFlag('ARCHIVER_MODE', 'log_type') \ + if d.getVarFlag('ARCHIVER_MODE', 'log_type') != 'none' else 'logs_with_scripts'}' +SOURCE_ARCHIVE_PACKAGE_TYPE ?= '${@d.getVarFlag('ARCHIVER_MODE','type') \ + if d.getVarFlag('ARCHIVER_MODE', 'log_type')!= 'none' else 'tar'}' def get_bb_inc(d): '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}''' -- cgit v1.2.3-54-g00ecf