archiver.bbclass:Improve the usability for the archiver classes

cover

 meta-yocto/conf/local.conf.sample.extended |   31 ++++++++++++++++-----------
 meta/classes/archiver.bbclass              |    6 +++-
 2 files changed, 22 insertions(+), 15 deletions(-)
---
 meta/classes/archiver.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
index ac8aa95..582c565 100644
@@ -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}'''

1.7.0.4
---
 meta-yocto/conf/local.conf.sample.extended |   31 ++++++++++++++++-----------
 1 files changed, 18 insertions(+), 13 deletions(-)
index b493094..66b94ad 100644
@@ -184,20 +184,25 @@
 
 # Archiving source code configuration
 #
-# The following variables control which files to archive and the type to archive to generate.
-# There are three basic class defintions of common operations that might be desired and these
-# can be enabled by uncommenting one of the following lines:
-#
-# INHERIT += "archive-original-source"
-# INHERIT += "archive-patched-source"
-#INHERIT =+ "archive-configured-source"
-#
+# The following variables control which files to archive and
+# the type to archive to generate.
+# The content to archive
+# "original":    Copy source code package from downloads if existing. 
+# Archive source code after do_unpack if not found in downloads 
+# "patched":    Archive source code package after do_patch
+# "configured": Archive source code package after do_configure 
+# ARCHIVER_MODE[choices] = "none original patched configured"
 # Type of archive:
-# SOURCE_ARCHIVE_PACKAGE_TYPE = 'srpm'
-#SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar'
-#
+# ARCHIVER_MODE[type] = "tar srpm"
 # Whether to include WORKDIR/temp, .bb and .inc files:
 # 'logs_with_scripts' include WORKDIR/temp directory and .bb and .inc files
 # 'logs' only include WORKDIR/temp
-# SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs'
-#SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs_with_scripts'
+# ARCHIVER_MODE[log_type] = "logs logs_with_scripts"
+# There are three basic class defintions of common operations 
+# that might be desired and these can be enabled by 
+# uncommenting five of the following lines:
+#ARCHIVER_MODE ?= "original"
+#ARCHIVER_MODE[type] ?= "tar"
+#ARCHIVER_MODE[log_type] ?= "logs_with_scripts"
+#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
+#INHERIT += "${ARCHIVER_CLASS}"

1.7.0.4
 2 files changed, 22 insertions(+), 15 deletions(-)
Elizabeth Flanagan
Yocto Project
Build and Release

archiver.bbclass:Improve the usability for the archiver classes

[email protected]

[email protected]

[email protected]

Flanagan, Elizabeth