[PATCH 0/2] archiver.bbclass:Improve the usability for the archiver classes

[PATCH 0/2] archiver.bbclass:Improve the usability for the archiver classes

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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.

The following changes since commit f28209d9d3c67203a2c7a2b25cacfe31643d1bfa:
  Kang Kai (1):
        cooker.py: terminate the Parser processes

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib xiaofeng/2472
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2472

Xiaofeng Yan (2):
  archiver.bbclass: Improve the usability for the archiver classes
  local.conf.sample.extended: Change the usage about arhiver.bbclass

 meta-yocto/conf/local.conf.sample.extended |   31 ++++++++++++++++-----------
 meta/classes/archiver.bbclass              |    6 +++-
 2 files changed, 22 insertions(+), 15 deletions(-)

[PATCH 1/2] archiver.bbclass: Improve the usability for the archiver classes

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/classes/archiver.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index ac8aa95..582c565 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}'''
-- 
1.7.0.4

[PATCH 2/2] local.conf.sample.extended: Change the usage about arhiver.bbclass

[xiaofeng.yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Change the usage about arhiver.bbclass due to the improvement for
usability of archiver.bbclass

[YOCTO #2472]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta-yocto/conf/local.conf.sample.extended |   31 ++++++++++++++++-----------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index b493094..66b94ad 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -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

Re: [PATCH 0/2] archiver.bbclass:Improve the usability for the archiver classes

[Flanagan, Elizabeth]

On Wed, May 30, 2012 at 11:02 PM,  <xiaofeng.yan@windriver.com> wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> 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.
>
> The following changes since commit f28209d9d3c67203a2c7a2b25cacfe31643d1bfa:
>  Kang Kai (1):
>        cooker.py: terminate the Parser processes
>
> are available in the git repository at:
>
>  git://git.pokylinux.org/poky-contrib xiaofeng/2472
>  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2472
>
> Xiaofeng Yan (2):
>  archiver.bbclass: Improve the usability for the archiver classes
>  local.conf.sample.extended: Change the usage about arhiver.bbclass
>
>  meta-yocto/conf/local.conf.sample.extended |   31 ++++++++++++++++-----------
>  meta/classes/archiver.bbclass              |    6 +++-
>  2 files changed, 22 insertions(+), 15 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


Merged into OE-Core

Thanks

-b


-- 
Elizabeth Flanagan
Yocto Project
Build and Release