* [PATCH 1/7] netbase: Correctly set FILESEXTRAPATHS to include the version
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 2/7] yocto-kernel: use BUILDDIR to find bblayers.conf Scott Garman
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/7] yocto-kernel: use BUILDDIR to find bblayers.conf
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
2012-06-04 21:00 ` [PATCH 1/7] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 3/7] yocto-bsp: clarify help with reference to meta-intel Scott Garman
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/7] yocto-bsp: clarify help with reference to meta-intel
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
2012-06-04 21:00 ` [PATCH 1/7] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
2012-06-04 21:00 ` [PATCH 2/7] yocto-kernel: use BUILDDIR to find bblayers.conf Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 4/7] Hob: Clear the building status if command failed Scott Garman
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/7] Hob: Clear the building status if command failed
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
` (2 preceding siblings ...)
2012-06-04 21:00 ` [PATCH 3/7] yocto-bsp: clarify help with reference to meta-intel Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 5/7] Hob: change the refresh icon speed to make it view clear Scott Garman
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/7] Hob: change the refresh icon speed to make it view clear
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
` (3 preceding siblings ...)
2012-06-04 21:00 ` [PATCH 4/7] Hob: Clear the building status if command failed Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 6/7] Hob: add original url show function with the tooltip hyperlink for user Scott Garman
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/7] Hob: add original url show function with the tooltip hyperlink for user
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
` (4 preceding siblings ...)
2012-06-04 21:00 ` [PATCH 5/7] Hob: change the refresh icon speed to make it view clear Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-04 21:00 ` [PATCH 7/7] Update version to 1.15.2 (correspdoning to Yocto 1.2 release) Scott Garman
2012-06-05 22:10 ` [PATCH 0/7] denzil pull request Richard Purdie
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/7] Update version to 1.15.2 (correspdoning to Yocto 1.2 release)
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
` (5 preceding siblings ...)
2012-06-04 21:00 ` [PATCH 6/7] Hob: add original url show function with the tooltip hyperlink for user Scott Garman
@ 2012-06-04 21:00 ` Scott Garman
2012-06-05 22:10 ` [PATCH 0/7] denzil pull request Richard Purdie
7 siblings, 0 replies; 11+ messages in thread
From: Scott Garman @ 2012-06-04 21:00 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/7] denzil pull request
2012-06-04 21:00 [PATCH 0/7] denzil pull request Scott Garman
` (6 preceding siblings ...)
2012-06-04 21:00 ` [PATCH 7/7] Update version to 1.15.2 (correspdoning to Yocto 1.2 release) Scott Garman
@ 2012-06-05 22:10 ` Richard Purdie
7 siblings, 0 replies; 11+ messages in thread
From: Richard Purdie @ 2012-06-05 22:10 UTC (permalink / raw)
To: Scott Garman; +Cc: poky
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
^ permalink raw reply [flat|nested] 11+ messages in thread