[PATCH 0/2] A couple of fixes

[PATCH 0/2] A couple of fixes

[Paul Eggleton]

The following changes since commit ed3aab90dbf9b6efefd9eb66d81123cb94d3c7da:

  toaster: update pyro to rocko as stable release (2017-09-11 11:00:11 +0100)

are available in the git repository at:

  git://git.openembedded.org/bitbake-contrib paule/bb-fixes
  http://cgit.openembedded.org/bitbake-contrib/log/?h=paule/bb-fixes

Paul Eggleton (2):
  runqueue: fix BB_SETSCENE_ENFORCE with empty BB_SETSCENE_ENFORCE_WHITELIST
  server/process: ensure server failure log is limited to current session

 lib/bb/runqueue.py       |  6 +++---
 lib/bb/server/process.py | 28 +++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

-- 
2.9.5

[PATCH 1/2] runqueue: fix BB_SETSCENE_ENFORCE with empty BB_SETSCENE_ENFORCE_WHITELIST

[Paul Eggleton]

The whitelist shouldn't have to be populated in order for the
enforcement to work properly - check if the list is not None in order to
determine whether the functionality is enabled or not since that is how
the function that sets up the list behaves.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 lib/bb/runqueue.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 6b3a0fc..ae12c25 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1834,7 +1834,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
         Run the tasks in a queue prepared by rqdata.prepare()
         """
 
-        if self.rqdata.setscenewhitelist and not self.rqdata.setscenewhitelist_checked:
+        if self.rqdata.setscenewhitelist is not None and not self.rqdata.setscenewhitelist_checked:
             self.rqdata.setscenewhitelist_checked = True
 
             # Check tasks that are going to run against the whitelist
@@ -2249,7 +2249,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
         self.scenequeue_updatecounters(task)
 
     def check_taskfail(self, task):
-        if self.rqdata.setscenewhitelist:
+        if self.rqdata.setscenewhitelist is not None:
             realtask = task.split('_setscene')[0]
             (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask)
             pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
@@ -2603,7 +2603,7 @@ def get_setscene_enforce_whitelist(d):
 
 def check_setscene_enforce_whitelist(pn, taskname, whitelist):
     import fnmatch
-    if whitelist:
+    if whitelist is not None:
         item = '%s:%s' % (pn, taskname)
         for whitelist_item in whitelist:
             if fnmatch.fnmatch(item, whitelist_item):
-- 
2.9.5

[PATCH 2/2] server/process: ensure server failure log is limited to current session

[Paul Eggleton]

Printing the last 10 lines of bitbake-cookerdaemon.log when the server
fails to start can sometimes result in printing the output from a
previous run, which could lead the user completely down the wrong path
in terms of the cause of the failure. Use a known start text containing
the time which we can then look for when scanning through the log, and
then grab the last 10 lines of that part instead.

Fixes [YOCTO #11903].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 lib/bb/server/process.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 5c7dfae..e64194d 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -33,6 +33,8 @@ import select
 import socket
 import subprocess
 import errno
+import re
+import datetime
 import bb.server.xmlrpcserver
 from bb import daemonize
 from multiprocessing import queues
@@ -358,6 +360,9 @@ class BitBakeProcessServerConnection(object):
         return
 
 class BitBakeServer(object):
+    start_log_format = '--- Starting bitbake server pid %s at %s ---'
+    start_log_datetime_format = '%Y-%m-%d %H:%M:%S.%f'
+
     def __init__(self, lock, sockname, configuration, featureset):
 
         self.configuration = configuration
@@ -383,6 +388,7 @@ class BitBakeServer(object):
         self.sock.listen(1)
 
         os.set_inheritable(self.sock.fileno(), True)
+        startdatetime = datetime.datetime.now()
         bb.daemonize.createDaemon(self._startServer, logfile)
         self.sock.close()
         self.bitbake_lock.close()
@@ -393,15 +399,31 @@ class BitBakeServer(object):
             ready.close()
             bb.error("Unable to start bitbake server")
             if os.path.exists(logfile):
+                logstart_re = re.compile(self.start_log_format % ('([0-9]+)', '([0-9-]+ [0-9:.]+)'))
+                started = False
+                lines = []
                 with open(logfile, "r") as f:
-                    logs=f.readlines()
-                bb.error("Last 10 lines of server log %s:\n%s" % (logfile, "".join(logs[-10:])))
+                    for line in f:
+                        if started:
+                            lines.append(line)
+                        else:
+                            res = logstart_re.match(line.rstrip())
+                            if res:
+                                ldatetime = datetime.datetime.strptime(res.group(2), self.start_log_datetime_format)
+                                if ldatetime >= startdatetime:
+                                    started = True
+                                    lines.append(line)
+                if lines:
+                    if len(lines) > 10:
+                        bb.error("Last 10 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-10:])))
+                    else:
+                        bb.error("Server log for this session (%s):\n%s" % (logfile, "".join(lines)))
             raise SystemExit(1)
         ready.close()
         os.close(self.readypipein)
 
     def _startServer(self):
-        print("Starting bitbake server pid %d" % os.getpid())
+        print(self.start_log_format % (os.getpid(), datetime.datetime.now().strftime(self.start_log_datetime_format)))
         server = ProcessServer(self.bitbake_lock, self.sock, self.sockname)
         self.configuration.setServerRegIdleCallback(server.register_idle_function)
 
-- 
2.9.5

[PATCH 0/2] A couple of fixes

[Paul Eggleton]

The following changes since commit b055075ba5b9ff5250bc66be1cd8b222bdb86161:

  slang: Fix rpath QA warnings (2012-03-15 00:07:43 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib paule/fixes15
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes15

Paul Eggleton (2):
  util-linux: restore zlib and ncurses dependencies for native
  python-imaging: bring in fixes from meta-oe

 meta/recipes-core/util-linux/util-linux.inc        |    2 +-
 meta/recipes-core/util-linux/util-linux_2.21.bb    |    2 +-
 ...ng-setup.py-force-paths-for-zlib-freetyp.patch} |   36 +++++++++++++++----
 .../python/python-imaging_1.1.7.bb                 |    9 +++--
 4 files changed, 36 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/python/python-imaging/{path.patch => 0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch} (47%)

-- 
1.7.5.4

Re: [PATCH 0/2] A couple of fixes

[Saul Wold]

On 03/15/2012 07:24 AM, Paul Eggleton wrote:
> The following changes since commit b055075ba5b9ff5250bc66be1cd8b222bdb86161:
>
>    slang: Fix rpath QA warnings (2012-03-15 00:07:43 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib paule/fixes15
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes15
>
> Paul Eggleton (2):
>    util-linux: restore zlib and ncurses dependencies for native
>    python-imaging: bring in fixes from meta-oe
>
>   meta/recipes-core/util-linux/util-linux.inc        |    2 +-
>   meta/recipes-core/util-linux/util-linux_2.21.bb    |    2 +-
>   ...ng-setup.py-force-paths-for-zlib-freetyp.patch} |   36 +++++++++++++++----
>   .../python/python-imaging_1.1.7.bb                 |    9 +++--
>   4 files changed, 36 insertions(+), 13 deletions(-)
>   rename meta/recipes-devtools/python/python-imaging/{path.patch =>  0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch} (47%)
>

Merged into OE-Core

Thanks
	Sau!

[PATCH 0/2] A couple of fixes

[Saul Wold]

Richard,

These patches address a couple of issues, the gnupg fixes the GPLv2 version
of that recipe, it was orignally pushed (by me as a mistake, got pulled too 
soon).  This version is correct and builds.

The syslinux change removes about 60 WARNINGS by packaging the remaining files
in syslinux-misc

Sau!

The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:

  scripts/hob: Launch the new hob (2012-02-24 18:05:46 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (2):
  gnupg: Update checksum, fix configure and compliation issues
  syslinux: Package unpackaged files in -misc

 meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    3 ++-
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch

-- 
1.7.7.6