[PATCH 0/2 V2] fixes for prserver

[PATCH 0/2 V2] fixes for prserver

[Robert Yang]

* V2:
  - Let bitbake-prserv-tool check filename for both .inc and .conf

// Robert

The following changes since commit e44ed8c18e395b9c055aefee113b90708e8a8a2f:

  build-appliance-image: Update to jethro head revision (2015-11-03 14:02:57 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib oe_contrib/rbt/prserv
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/prserv

Robert Yang (2):
  prexport.bbclass: avoid export for native and crosssdk
  bitbake-prserv-tool: check file name

 meta/classes/prexport.bbclass |    5 +++--
 scripts/bitbake-prserv-tool   |    9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] prexport.bbclass: avoid export for native and crosssdk

[Robert Yang]

* The prservice is only used by do_package, the native or crosssdk
  doesn't have do_package.
* Change WARN to NOTE when no AUTOPR found, the prexport_handler()
  checks all the parsed recipes, but a lot of them may not be built, for
  example, the lower version or broken recipes. So change WARN to NOTE to
  not confuse user.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/prexport.bbclass |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/prexport.bbclass b/meta/classes/prexport.bbclass
index 5a1cb33..809ec10 100644
--- a/meta/classes/prexport.bbclass
+++ b/meta/classes/prexport.bbclass
@@ -8,7 +8,8 @@ PRSERV_DUMPFILE ??= "${PRSERV_DUMPDIR}/prserv.inc"
 
 python prexport_handler () {
     import bb.event
-    if not e.data:
+    if not e.data or bb.data.inherits_class('native', e.data) or \
+        bb.data.inherits_class('crosssdk', e.data):
         return
 
     if isinstance(e, bb.event.RecipeParsed):
@@ -21,7 +22,7 @@ python prexport_handler () {
             bb.fatal("prexport_handler: export failed!")
         (metainfo, datainfo) = retval
         if not datainfo:
-            bb.warn("prexport_handler: No AUTOPR values found for %s" % ver)
+            bb.note("prexport_handler: No AUTOPR values found for %s" % ver)
             return
         oe.prservice.prserv_export_tofile(e.data, None, datainfo, False)
         if 'AUTOINC' in ver:
-- 
1.7.9.5

[PATCH 2/2] bitbake-prserv-tool: check file name

[Robert Yang]

Fixed:
$ bitbake-prserv-tool import /tmp/1
  File "/path/to/lib/bb/parse/__init__.py", line 114, in handle(fn='/tmp/1', data=<bb.data_smart.DataSmart object at 0x2369bd0>, include=True):
                     return h['handle'](fn, data, include)
    >    raise ParseError("not a BitBake file", fn)

ParseError: ParseError in /tmp/1: not a BitBake file

But 1.conf or 1.inc works well, check the filename and print proper
error message.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 scripts/bitbake-prserv-tool |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool
index 28c2416..fa31b52 100755
--- a/scripts/bitbake-prserv-tool
+++ b/scripts/bitbake-prserv-tool
@@ -86,6 +86,15 @@ do_migrate_localcount ()
 
 [ $# -eq 0 ] && help  && exit 1
 
+case $2 in
+*.conf|*.inc)
+    ;;
+*)
+    echo ERROR: $2 must end with .conf or .inc!
+    exit 1
+    ;;
+esac
+
 case $1 in
 export)
     do_export $2
-- 
1.7.9.5