[PATCH 0/7] denzil pull request

[PATCH 0/7] denzil pull request

[Scott Garman]

Hello,

This is a pull request for the poky denzil branch, based on a set of
commits I've been testing from my sgarman/denzil-next branch.

These commits have passed an array of build and runtime tests,
including the following nightly build:

http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/492

a non-gplv3 build:

http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/87

and a tiny build:

http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/69

Please give this pull request a few days to receive feedback and ACKs
from the community.

Thanks,

Scott

The following changes since commit 7552ccd06c6327b5f36ee0cceb432946f8e98d3f:

  documentation/yocto-project-qs/yocto-project-qs.xml: pre-built example fix (2012-05-31 21:22:29 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib sgarman/denzil-next-testing
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next-pull1

Dongxiao Xu (1):
  Hob: Clear the building status if command failed

Liming An (2):
  Hob: change the refresh icon speed to make it view clear
  Hob: add original url show function with the tooltip hyperlink for
    user

Richard Purdie (2):
  netbase: Correctly set FILESEXTRAPATHS to include the version
  Update version to 1.15.2 (correspdoning to Yocto 1.2 release)

Tom Zanussi (2):
  yocto-kernel: use BUILDDIR to find bblayers.conf
  yocto-bsp: clarify help with reference to meta-intel

 bitbake/bin/bitbake                                |    2 +-
 bitbake/lib/bb/__init__.py                         |    2 +-
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py        |    2 +
 bitbake/lib/bb/ui/crumbs/hobwidget.py              |    2 +-
 bitbake/lib/bb/ui/crumbs/persistenttooltip.py      |   19 ++++++++
 .../recipes-core/netbase/netbase_4.47.bbappend     |    2 +-
 scripts/lib/bsp/help.py                            |   48 ++++++++++++++++++--
 scripts/lib/bsp/kernel.py                          |    7 ++-
 8 files changed, 75 insertions(+), 9 deletions(-)

-- 
1.7.9.5

[PATCH 1/7] netbase: Correctly set FILESEXTRAPATHS to include the version

[Scott Garman]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

[YOCTO #2366]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-core/netbase/netbase_4.47.bbappend     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto/recipes-core/netbase/netbase_4.47.bbappend b/meta-yocto/recipes-core/netbase/netbase_4.47.bbappend
index 72d991c..5622303 100644
--- a/meta-yocto/recipes-core/netbase/netbase_4.47.bbappend
+++ b/meta-yocto/recipes-core/netbase/netbase_4.47.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-- 
1.7.9.5

[PATCH 2/7] yocto-kernel: use BUILDDIR to find bblayers.conf

[Scott Garman]

From: Tom Zanussi <tom.zanussi@intel.com>

The current code assumes that builddir == srcdir/build, which it
obviously isn't sometimes.  Use BUILDDIR to get the actual builddir
being used.

Fixes [YOCTO #2219].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 scripts/lib/bsp/kernel.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index 360851b..8b3aa72 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -37,7 +37,12 @@ def find_bblayers(scripts_path):
     """
     Find and return a sanitized list of the layers found in BBLAYERS.
     """
-    bblayers_conf = os.path.join(scripts_path, "../build/conf/bblayers.conf")
+    try:
+        builddir = os.environ["BUILDDIR"]
+    except KeyError:
+        print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)"
+        sys.exit(1)
+    bblayers_conf = os.path.join(builddir, "conf/bblayers.conf")
 
     layers = []
 
-- 
1.7.9.5

[PATCH 3/7] yocto-bsp: clarify help with reference to meta-intel

[Scott Garman]

From: Tom Zanussi <tom.zanussi@intel.com>

The current yocto-bsp help assumes knowledge that the meta-intel layer
needs to be cloned before it's put into the BBLAYERS.  Avoid the
guesswork and state the details explicitly in the help.

Also, the shorter 'usage' string doesn't mention it at all; it would
help to at minimum mention it and refer the user to the detailed help.

Fixes [YOCTO #2330].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 scripts/lib/bsp/help.py |   48 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/bsp/help.py b/scripts/lib/bsp/help.py
index f78b09b..2d16d2e 100644
--- a/scripts/lib/bsp/help.py
+++ b/scripts/lib/bsp/help.py
@@ -115,6 +115,18 @@ yocto_bsp_create_usage = """
  'properties' that will be used to fill out the BSP-specific portions
  of the BSP.  The possible values for the 'karch' paramter can be
  listed via 'yocto-bsp list karch'.
+
+ NOTE: Once created, you should add your new layer to your
+ bblayers.conf file in order for it to be subsequently seen and
+ modified by the yocto-kernel tool.
+
+ See 'yocto bsp help create' for more detailed instructions.
+
+ NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes the
+ presence of the meta-intel layer. Ensure the meta-intel layer is
+ present and added to bblayers.conf.
+
+ See 'yocto bsp help create' for more detailed instructions.
 """
 
 yocto_bsp_create_help = """
@@ -156,12 +168,40 @@ DESCRIPTION
     current directory, and is useful for debugging.
 
     NOTE: Once created, you should add your new layer to your
-    bblayers.conf file in order for it to be subsquently seen and
+    bblayers.conf file in order for it to be subsequently seen and
     modified by the yocto-kernel tool.
 
-    NOTE for x86- and x86_64-based BSPs: The generated BSP assumes the
-    presence of the of the meta-intel layer, so you should also have a
-    meta-intel layer present and added to your bblayers.conf as well.
+    For example, assuming your poky repo is at /path/to/poky, your new
+    BSP layer is at /path/to/poky/meta-mybsp, and your build directory
+    is /path/to/build:
+
+    $ gedit /path/to/build/conf/bblayers.conf
+
+    BBLAYERS ?= " \\
+      /path/to/poky/meta \\
+      /path/to/poky/meta-yocto \\
+      /path/to/poky/meta-mybsp \\
+      "
+
+    NOTE: For x86- and x86_64-based BSPs, the generated BSP assumes
+    the presence of the meta-intel layer. Ensure the meta-intel layer
+    is present and added to bblayers.conf.
+
+    For example, assuming your poky repo is at /path/to/poky, your new
+    BSP layer is at /path/to/poky/meta-mybsp, and your build directory
+    is /path/to/build:
+
+    $ cd /path/to/poky
+    $ git clone git://git.yoctoproject.org/meta-intel.git
+
+    $ gedit /path/to/build/conf/bblayers.conf
+
+    BBLAYERS ?= " \\
+      /path/to/poky/meta \\
+      /path/to/poky/meta-yocto \\
+      /path/to/poky/meta-intel \\
+      /path/to/poky/meta-mybsp \\
+      "
 """
 
 yocto_bsp_list_usage = """
-- 
1.7.9.5

[PATCH 4/7] Hob: Clear the building status if command failed

[Scott Garman]

From: Dongxiao Xu <dongxiao.xu@intel.com>

We may meet certain command failure during build time, for example,
out of memory. In this case, we need to clear the "building" status.

This fixes [YOCTO #2371]

(Bitbake rev: 283dbbbf5d34adb4c9e3aa87e3925fdebe21ff42)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index a07afdd..624d7b5 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -199,6 +199,8 @@ class HobHandler(gobject.GObject):
             self.clear_busy()
             self.emit("command-failed", self.error_msg)
             self.error_msg = ""
+            if self.building:
+                self.building = False
         elif isinstance(event, (bb.event.ParseStarted,
                  bb.event.CacheLoadStarted,
                  bb.event.TreeDataPreparationStarted,
-- 
1.7.9.5

[PATCH 5/7] Hob: change the refresh icon speed to make it view clear

[Scott Garman]

From: Liming An <limingx.l.an@intel.com>

Because the arrow icon refresh so fast as the go backward by illusion, so adjust it slow.

[YOCTO #2335]

(Bitbake rev: ac4a8885fafdc0d1e79831334ead9a8ddb6e2472)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/bb/ui/crumbs/hobwidget.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py
index 751b3e0..6cf73b0 100644
--- a/bitbake/lib/bb/ui/crumbs/hobwidget.py
+++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py
@@ -1057,7 +1057,7 @@ class HobCellRendererPixbuf(gtk.CellRendererPixbuf):
             if self.control.is_active():
                 self.control.on_draw_pixbuf_cb(pix, window.cairo_create(), x, y, w, h, True)
             else:
-                self.control.start_run(200, 0, 0, 1000, 200, tree)
+                self.control.start_run(200, 0, 0, 1000, 150, tree)
         else:
             self.control.remove_running_cell_area(cell_area)
             self.control.on_draw_pixbuf_cb(pix, window.cairo_create(), x, y, w, h, False)
-- 
1.7.9.5

[PATCH 6/7] Hob: add original url show function with the tooltip hyperlink for user

[Scott Garman]

From: Liming An <limingx.l.an@intel.com>

When case about No browser, such as running in 'Build Appliance', user can't open
the hyper link, so add this work around for user. (Checking the browser is avaiable
or not is hard by different system and browser type)

[YOCTO #2340]

(Bitbake rev: 02cc701869bceb2d0e11fe3cf51fb0582cda01b0)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/bb/ui/crumbs/persistenttooltip.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bitbake/lib/bb/ui/crumbs/persistenttooltip.py b/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
index b43d297..927c194 100644
--- a/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
+++ b/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
@@ -125,11 +125,17 @@ class PersistentTooltip(gtk.Window):
                 style.fg[gtk.STATE_NORMAL] = gtk.gdk.color_parse(val)
                 self.label.set_style(style)
                 break # we only care for the tooltip_fg_color
+
         self.label.set_markup(markup)
         self.label.show()
         bin.add(self.label)
         hbox.pack_end(bin, True, True, 6)
 
+        # add the original URL display for user reference
+        if 'a href' in markup:
+            hbox.set_tooltip_text(self.get_markup_url(markup))
+        hbox.show()
+
         self.connect("key-press-event", self._catch_esc_cb)
 
     """
@@ -165,3 +171,16 @@ class PersistentTooltip(gtk.Window):
     def hide(self):
         self.shown = False
         gtk.Window.hide(self)
+
+    """
+    Called to get the hyperlink URL from markup text.
+    """
+    def get_markup_url(self, markup):
+        url = "http:"
+        if markup and type(markup) == str:
+            s = markup
+            if 'http:' in s:
+                import re
+                url = re.search('(http:[^,\\ "]+)', s).group(0)
+
+        return url
-- 
1.7.9.5

[PATCH 7/7] Update version to 1.15.2 (correspdoning to Yocto 1.2 release)

[Scott Garman]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

(Bitbake rev: 270a05b0b4ba0959fe0624d2a4885d7b70426da5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/bin/bitbake        |    2 +-
 bitbake/lib/bb/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index a90f6c6..420e69d 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -40,7 +40,7 @@ from bb import cooker
 from bb import ui
 from bb import server
 
-__version__ = "1.15.1"
+__version__ = "1.15.2"
 logger = logging.getLogger("BitBake")
 
 
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 8d579c7..0b3c4bf 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.15.1"
+__version__ = "1.15.2"
 
 import sys
 if sys.version_info < (2, 6, 0):
-- 
1.7.9.5

Re: [PATCH 0/7] denzil pull request

[Richard Purdie]

On Mon, 2012-06-04 at 14:00 -0700, Scott Garman wrote:
> This is a pull request for the poky denzil branch, based on a set of
> commits I've been testing from my sgarman/denzil-next branch.
> 
> These commits have passed an array of build and runtime tests,
> including the following nightly build:
> 
> http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/492
> 
> a non-gplv3 build:
> 
> http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/87
> 
> and a tiny build:
> 
> http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/69

I've merged these into poky's denzil branch, thanks.

Richard

[PATCH 0/7] denzil pull request

[Scott Garman]

Hello,

This is a pull request for denzil. It includes a bitbake fix from
MatthewM (poky-based tree only) and some Fedora 18 build fixes from
Koen.

Build status: 100% Green.

nightly-x86: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/885

nightly-x86-lsb: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-lsb/builds/214

nightly-x86-64: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/810

nightly-x86-64-lsb: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64-lsb/builds/209

nightly-arm: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/814

nightly-arm-lsb: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm-lsb/builds/207

nightly-mips: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-mips/builds/786

nightly-mips-lsb: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-mips-lsb/builds/213

nightly-ppc: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/765

nightly-ppc-lsb: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc-lsb/builds/217

nightly-non-gpl3: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/443

nightly-multilib: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/444

nightly-tiny: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/420

build-appliance: Green
http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/220

eclipse-plugin: Green
http://autobuilder.yoctoproject.org:8010/builders/eclipse-plugin/builds/763


The following changes since commit 3456295898bf157e40ea1f8c335f0b7285d3d8a7:

  build-appliance-image: Bump SRCREV (2013-01-04 22:23:43 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib sgarman/denzil-next
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next

Christopher Larson (1):
  bitbake: command: add error to return of runCommand

Martin Jansa (1):
  bison: move remove-gets.patch to BASE_SRC_URI, it's needed for
    bison-native too if host has (e)glibc-2.16

Nitin A Kamble (1):
  libtasn1: fix build with automake 1.12

Richard Purdie (2):
  bitbake: command: Add missing import traceback
  bitbake: command: Fix getCmdLineAction bugs

Saul Wold (2):
  libtasn1: Update to 2.12
  libtasn1: Upgrade to 2.13

 bitbake/lib/bb/command.py                          |   46 +++++++++++++-------
 bitbake/lib/bb/server/process.py                   |    2 +-
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py        |    5 ++-
 bitbake/lib/bb/ui/depexp.py                        |   38 ++++++++++------
 bitbake/lib/bb/ui/goggle.py                        |   17 +++++---
 bitbake/lib/bb/ui/knotty.py                        |   45 +++++++++++++------
 bitbake/lib/bb/ui/ncurses.py                       |   21 ++++++---
 meta/recipes-devtools/bison/bison_2.5.bb           |    4 +-
 .../libtasn1/libtasn1_fix_for_automake_1.12.patch  |   28 ++++++++++++
 .../gnutls/{libtasn1_2.11.bb => libtasn1_2.13.bb}  |    8 ++--
 10 files changed, 150 insertions(+), 64 deletions(-)
 create mode 100644 meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch
 rename meta/recipes-support/gnutls/{libtasn1_2.11.bb => libtasn1_2.13.bb} (65%)

-- 
1.7.9.5

Re: [PATCH 0/7] denzil pull request

[Richard Purdie]

On Sun, 2013-01-27 at 15:41 -0800, Scott Garman wrote:
> Hello,
> 
> This is a pull request for denzil. It includes a bitbake fix from
> MatthewM (poky-based tree only) and some Fedora 18 build fixes from
> Koen.
[...]
> The following changes since commit 3456295898bf157e40ea1f8c335f0b7285d3d8a7:
> 
>   build-appliance-image: Bump SRCREV (2013-01-04 22:23:43 +0000)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib sgarman/denzil-next
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next
> 
> Christopher Larson (1):
>   bitbake: command: add error to return of runCommand
> 
> Martin Jansa (1):
>   bison: move remove-gets.patch to BASE_SRC_URI, it's needed for
>     bison-native too if host has (e)glibc-2.16
> 
> Nitin A Kamble (1):
>   libtasn1: fix build with automake 1.12
> 
> Richard Purdie (2):
>   bitbake: command: Add missing import traceback
>   bitbake: command: Fix getCmdLineAction bugs
> 
> Saul Wold (2):
>   libtasn1: Update to 2.12
>   libtasn1: Upgrade to 2.13

Merged to denzil, thanks.

Richard