* RFC: [PATCH 00/31] denzil pull request
@ 2012-06-12 20:40 Scott Garman
2012-06-12 20:40 ` [PATCH 01/31] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
` (32 more replies)
0 siblings, 33 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 UTC (permalink / raw)
To: poky
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.
I'm submitting this as an RFC so the community can offer feedback as
soon as possible. I'm planning on running this through the Yocto
autobuilder tonight and will reply to this thread with test results.
Assuming we get green builds, the goal is to get this pull request
merged into poky's denzil branch fairly quickly, so please speak
up if you have any comments or concerns with these commits.
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
Dongxiao Xu (1):
Hob: Clear the building status if command failed
Jesse Zhang (1):
beecrypt: disable java
Joe Slater (1):
shared-mime-info: fix build race condition
Joshua Lock (1):
sanity.bbclass: copy the data store and finalise before running
checks
Kang Kai (1):
cooker.py: terminate the Parser processes
Laurentiu Palcu (1):
freetype: upgrade to 2.4.9
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
Mihai Lindner (1):
sudo: fixed wrong `chmod` path
Paul Eggleton (3):
classes/sanity: send sanity check failure as a separate event for Hob
hob: handle sanity check failures as a separate event
poky.conf: use correct version string for Ubuntu 12.04
Paul Gortmaker (1):
gitignore: add wildcard to match toplevel patch files
Richard Purdie (4):
netbase: Correctly set FILESEXTRAPATHS to include the version
Update version to 1.15.2 (correspdoning to Yocto 1.2 release)
bitbake.conf: Improve wget timeouts
image.bbclass: Ensure ${S} is cleaned at the start of rootfs
generation
Robert Yang (1):
rpm 5.4.0: respect to the arch when choose the alternatives
Scott Garman (1):
runqemu-ifup: enable arp proxying
Scott Rifenbark (4):
documentation/bsp-guide/bsp.xml: BSP recommendations section added
documentation/bsp-guide/bsp.xml: Updates to requirements section
documentation/bsp-guide/bsp.xml: Review comments to recommendations
documentation/poky.ent: Updated variables for correct 1.2.1 build.
Shane Wang (1):
Hob: Adjust the progress bar and set 100% only when all is done.
Song.Li (1):
groff: Fix build on Fedora 17
Tom Zanussi (4):
yocto-kernel: use BUILDDIR to find bblayers.conf
yocto-bsp: clarify help with reference to meta-intel
gnupg: add libusb to DEPENDS
gnupg: disable CCID driver
Xiaofeng Yan (1):
ncurses: Avoid occasional builling failure when having parallel
processable task
Zhai Edwin (1):
webkit-gtk: Use glib as unicode backend to avoid browser crash
.gitignore | 1 +
bitbake/bin/bitbake | 2 +-
bitbake/lib/bb/__init__.py | 2 +-
bitbake/lib/bb/cooker.py | 9 +-
bitbake/lib/bb/event.py | 8 +
bitbake/lib/bb/ui/crumbs/builder.py | 19 +-
bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 16 ++
bitbake/lib/bb/ui/crumbs/hobwidget.py | 2 +-
bitbake/lib/bb/ui/crumbs/persistenttooltip.py | 19 ++
documentation/bsp-guide/bsp.xml | 232 +++++++++++++++++++-
documentation/poky.ent | 4 +-
meta-yocto/conf/distro/poky.conf | 2 +-
.../recipes-core/netbase/netbase_4.47.bbappend | 2 +-
meta/classes/image.bbclass | 1 +
meta/classes/sanity.bbclass | 143 ++++++------
meta/conf/bitbake.conf | 8 +-
meta/recipes-core/ncurses/ncurses.inc | 23 +-
.../rpm/rpm/rpm-respect-arch.patch | 67 ++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
meta/recipes-extended/groff/groff_1.20.1.bb | 24 +-
meta/recipes-extended/sudo/sudo_1.8.4p4.bb | 6 +-
.../no-hardcode.patch | 0
.../{freetype_2.4.8.bb => freetype_2.4.9.bb} | 4 +-
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 10 +-
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 4 +-
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 3 +-
.../shared-mime-info/install-data-hook.patch | 21 ++
.../shared-mime-info/shared-mime-info_0.91.bb | 5 +-
scripts/lib/bsp/help.py | 48 +++-
scripts/lib/bsp/kernel.py | 7 +-
scripts/runqemu-ifup | 1 +
31 files changed, 589 insertions(+), 107 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
rename meta/recipes-graphics/freetype/{freetype-2.4.8 => freetype-2.4.9}/no-hardcode.patch (100%)
rename meta/recipes-graphics/freetype/{freetype_2.4.8.bb => freetype_2.4.9.bb} (91%)
create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
--
1.7.9.5
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 01/31] netbase: Correctly set FILESEXTRAPATHS to include the version
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 02/31] yocto-kernel: use BUILDDIR to find bblayers.conf Scott Garman
` (31 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 02/31] yocto-kernel: use BUILDDIR to find bblayers.conf
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
2012-06-12 20:40 ` [PATCH 01/31] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 03/31] yocto-bsp: clarify help with reference to meta-intel Scott Garman
` (30 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 03/31] yocto-bsp: clarify help with reference to meta-intel
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
2012-06-12 20:40 ` [PATCH 01/31] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
2012-06-12 20:40 ` [PATCH 02/31] yocto-kernel: use BUILDDIR to find bblayers.conf Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 04/31] Hob: Clear the building status if command failed Scott Garman
` (29 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 04/31] Hob: Clear the building status if command failed
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (2 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 03/31] yocto-bsp: clarify help with reference to meta-intel Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 05/31] Hob: change the refresh icon speed to make it view clear Scott Garman
` (28 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 05/31] Hob: change the refresh icon speed to make it view clear
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (3 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 04/31] Hob: Clear the building status if command failed Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 06/31] Hob: add original url show function with the tooltip hyperlink for user Scott Garman
` (27 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 06/31] Hob: add original url show function with the tooltip hyperlink for user
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (4 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 05/31] Hob: change the refresh icon speed to make it view clear Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 07/31] Update version to 1.15.2 (correspdoning to Yocto 1.2 release) Scott Garman
` (26 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 07/31] Update version to 1.15.2 (correspdoning to Yocto 1.2 release)
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (5 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 06/31] Hob: add original url show function with the tooltip hyperlink for user Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 08/31] Hob: Adjust the progress bar and set 100% only when all is done Scott Garman
` (25 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 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] 34+ messages in thread
* [PATCH 08/31] Hob: Adjust the progress bar and set 100% only when all is done.
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (6 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 07/31] Update version to 1.15.2 (correspdoning to Yocto 1.2 release) Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:40 ` [PATCH 09/31] documentation/bsp-guide/bsp.xml: BSP recommendations section added Scott Garman
` (24 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 UTC (permalink / raw)
To: poky
From: Shane Wang <shane.wang@intel.com>
After parsing recipes, Hob will populate recipes and packages, which is probably
time exhaused. So, this patch is to adjust the progress bar and ensure 100% is
set if and only if all populations are done.
The patch also fixes "weird 18 second delay when parsing recipes" on build appliance.
Because Hob is doing something, but the progress bar shows 100% and wait there.
[Yocto #2341]
(Bitbake rev: 2c4a21dc8a588c8cf05549ddd9734731a46bea10)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
bitbake/lib/bb/ui/crumbs/builder.py | 12 ++++++++++--
bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 8 ++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 4b274a7..3f68782 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -354,6 +354,8 @@ class Builder(gtk.Window):
self.handler.connect("data-generated", self.handler_data_generated_cb)
self.handler.connect("command-succeeded", self.handler_command_succeeded_cb)
self.handler.connect("command-failed", self.handler_command_failed_cb)
+ self.handler.connect("recipe-populated", self.handler_recipe_populated_cb)
+ self.handler.connect("package-populated", self.handler_package_populated_cb)
self.handler.set_config_filter(hob_conf_filter)
@@ -698,6 +700,12 @@ class Builder(gtk.Window):
def packagelist_changed_cb(self, package_model):
self.package_details_page.refresh_selection()
+ def handler_recipe_populated_cb(self, handler):
+ self.image_configuration_page.update_progress_bar("Populated recipes", 0.99)
+
+ def handler_package_populated_cb(self, handler):
+ self.image_configuration_page.update_progress_bar("Populated packages", 1.0)
+
def handler_parsing_started_cb(self, handler, message):
if self.current_step != self.RCPPKGINFO_POPULATING:
return
@@ -717,7 +725,7 @@ class Builder(gtk.Window):
fraction = message["current"] * 1.0/message["total"]
if message["eventname"] == "TreeDataPreparationProgress":
- fraction = 0.6 + 0.4 * fraction
+ fraction = 0.6 + 0.38 * fraction
else:
fraction = 0.6 * fraction
self.image_configuration_page.update_progress_bar(message["title"], fraction)
@@ -727,7 +735,7 @@ class Builder(gtk.Window):
return
if message["eventname"] == "TreeDataPreparationCompleted":
- fraction = 1.0
+ fraction = 0.98
else:
fraction = 0.6
self.image_configuration_page.update_progress_bar(message["title"], fraction)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 624d7b5..424bcfa 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -57,6 +57,12 @@ class HobHandler(gobject.GObject):
"parsing-completed" : (gobject.SIGNAL_RUN_LAST,
gobject.TYPE_NONE,
(gobject.TYPE_PYOBJECT,)),
+ "recipe-populated" : (gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ ()),
+ "package-populated" : (gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ ()),
}
(GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO, SANITY_CHECK) = range(6)
@@ -158,6 +164,7 @@ class HobHandler(gobject.GObject):
if isinstance(event, bb.event.PackageInfo):
self.package_model.populate(event._pkginfolist)
+ self.emit("package-populated")
self.run_next_command()
elif isinstance(event, bb.event.SanityCheckPassed):
@@ -171,6 +178,7 @@ class HobHandler(gobject.GObject):
self.current_phase = "data generation"
if event._model:
self.recipe_model.populate(event._model)
+ self.emit("recipe-populated")
elif isinstance(event, bb.event.ConfigFilesFound):
self.current_phase = "configuration lookup"
var = event._variable
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 09/31] documentation/bsp-guide/bsp.xml: BSP recommendations section added
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (7 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 08/31] Hob: Adjust the progress bar and set 100% only when all is done Scott Garman
@ 2012-06-12 20:40 ` Scott Garman
2012-06-12 20:41 ` [PATCH 10/31] documentation/bsp-guide/bsp.xml: Updates to requirements section Scott Garman
` (23 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:40 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Added the "Requirements and Recommendations for Released BSPs"
section. This section was requested by Dave Stewart based on
community input for direction on how to create a BSP that was
compliant with the Yocto Project. The input for the section came
from Tom Zanussi.
A spell-check was performed also prior to this commit that addressed
a few spelling issues across the file.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/bsp-guide/bsp.xml | 206 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 5 deletions(-)
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index a245332..1b5f0f5 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -75,7 +75,7 @@
<para>
Some layers function as a layer to hold other BSP layers.
- An example of this type of layers is the <filename>meta-intel</filename> layer.
+ An example of this type of layer is the <filename>meta-intel</filename> layer.
The <filename>meta-intel</filename> layer contains over 10 individual BSP layers.
</para>
@@ -122,6 +122,15 @@
</para>
<para>
+ Before looking at the common form for the file structure inside a BSP Layer,
+ you should be aware that some requirements do exist in order for a BSP to
+ be considered compliant with the Yocto Project.
+ For that list of requirements, see the
+ "<link linkend='released-bsp-requirements'>Released BSP Requirements</link>"
+ section.
+ </para>
+
+ <para>
Below is the common form for the file structure inside a BSP Layer.
While you can use this basic form for the standard, realize that the actual structures
for specific BSPs could differ.
@@ -644,6 +653,193 @@
</section>
</section>
+ <section id='requirements-and-recommendations-for-released-bsps'>
+ <title>Requirements and Recommendations for Released BSPs</title>
+
+ <para>
+ Certain requirements exist for a released BSP to be considered
+ compliant with the Yocto Project.
+ Additionally, a single recommendation also exists.
+ This section describes the requirements and recommendation for
+ released BSPs.
+ </para>
+
+ <section id='released-bsp-requirements'>
+ <title>Released BSP Requirements</title>
+
+ <para>
+ Before looking at BSP requirements, you should consider the following:
+ <itemizedlist>
+ <listitem><para>The requirements here assume the base Yocto Project requirements
+ for the BSP layer are already met.
+ For example, requirements for working with the
+ <filename>oe-core</filename> and standard toolchain layers.</para></listitem>
+ <listitem><para>The requirements in this section apply regardless of how you
+ ultimately package a BSP.
+ You should consult the packaging and distribution guidelines for your
+ specific release process.
+ For an example of packaging and distribution requirements, see the
+ <ulink url='https://wiki.yoctoproject.org/wiki/Third_Party_BSP_Release_Process'>Third
+ Party BSP Release Process</ulink> wiki page.</para></listitem>
+ <listitem><para>The requirements for the BSP as it is made available to a developer
+ are completely independent of the released form of the BSP.
+ For example, the BSP metadata can be contained within a Git repository
+ and could have a directory structure completely different from what appears
+ in the officially released BSP layer.</para></listitem>
+ <listitem><para>No requirement stipulates that specific packages or package
+ modifications exist in the BSP layer, beyond the requirements for general
+ compliance with the Yocto Project.
+ For example, no requirement exists dictating that a specific kernel or
+ kernel version be used in a given BSP.</para></listitem>
+ </itemizedlist>
+ </para>
+
+ <para>
+ Following are the requirements for a released BSP that conforms to the
+ Yocto Project:
+ <itemizedlist>
+ <listitem><para><emphasis>Layer Name:</emphasis>
+ The BSP must have a layer name that follows the Yocto
+ Project standards.
+ For information on BSP layer names, see the
+ "<link linkend='bsp-layers'>BSP Layers</link>" section.
+ </para></listitem>
+ <listitem><para><emphasis>File System Layout:</emphasis>
+ In general, the filesystem layout for the BSP layer
+ should use the same directory names
+ as listed in <filename>recipes.txt</filename>.
+ You can find <filename>recipes.txt</filename> in the
+ <filename>meta</filename> directory of the
+ <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto
+ Project Files</ulink>, or in the OpenEmbedded Core Layer
+ (<filename>openembedded-core</filename>) found at
+ <ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>.
+ </para>
+ <para>In particular, you should place recipes
+ (<filename>.bb</filename> files) and recipe
+ modifications (<filename>.bbappend</filename> files) into
+ <filename>recipes-*</filename> subdirectories by functional area
+ as outlined in <filename>recipes.txt</filename>.
+ If none of the categories fits a particular recipe, you can
+ make up your own <filename>recipe-*</filename> subdirectory.</para>
+ <para>Within any particular <filename>recipes-*</filename> category, the layout
+ should match what is found in the OpenEmbedded Core
+ Git repository (<filename>openembedded-core</filename>)
+ or the Yocto Project Files (<filename>poky</filename>).
+ In other words, make sure you place related files in appropriately
+ related <filename>recipes-*</filename> subdirectories specific to the
+ recipe's function, or within a subdirectory containing a set of closely-related
+ recipes.
+ The recipes themselves should follow the general guidelines
+ for recipes used in the Yocto Project found in the
+ <ulink url='https://wiki.yoctoproject.org/wiki/Recipe_%26_Patch_Style_Guide'>Yocto
+ Recipe and Patch Style Guide</ulink>.</para></listitem>
+ <listitem><para><emphasis>License File:</emphasis>
+ You must include a license file in the
+ <filename>meta-<bsp_name></filename> directory.
+ This license covers the BSP metadata as a whole.
+ You must specify which license to use since there is no
+ default license if one is not specified.</para></listitem>
+ <listitem><para><emphasis>README File:</emphasis>
+ You must include a <filename>README</filename> file in the
+ <filename>meta-<bsp_name></filename> directory.
+ At a minimum, the <filename>README</filename> file should
+ contain the following:
+ <itemizedlist>
+ <listitem><para>A brief description about the hardware the BSP
+ targets.</para></listitem>
+ <listitem><para>A list of all the dependencies a
+ on which a BSP layer depends.
+ These dependencies are typically a list of required layers needed
+ to build the BSP.
+ However, the dependencies should also contain information regarding
+ any other dependencies the BSP might have.</para></listitem>
+ <listitem><para>Any required special licensing information.
+ For example, this information includes information on
+ special variables needed to satisfy a EULA,
+ or instructions on information needed to build or distribute
+ binaries built from the BSP metadata.</para></listitem>
+ <listitem><para>The name and contact information for the
+ BSP layer maintainer.
+ This is the person to whom patches and questions should
+ be sent.</para></listitem>
+ <listitem><para>Instructions on how to build the BSP using the BSP
+ layer.</para></listitem>
+ <listitem><para>Instructions on how to boot the BSP build from
+ the BSP layer.</para></listitem>
+ <listitem><para>Instructions on how to boot the binary images
+ contained in the <filename>/binary</filename> directory,
+ if present.</para></listitem>
+ <listitem><para>Information on any known bugs or issues that users
+ should know about when either building or booting the BSP
+ binaries.</para></listitem>
+ </itemizedlist></para></listitem>
+ <listitem><para><emphasis>README.sources File:</emphasis>
+ You must include a <filename>README.sources</filename> in the
+ <filename>meta-<bsp_name></filename> directory.
+ This file specifies exactly where you can find the sources used to
+ generate the binary images contained in the
+ <filename>/binary</filename> directory, if present.</para></listitem>
+ <listitem><para><emphasis>Layer Configuration File:</emphasis>
+ You must include a <filename>conf/layer.conf</filename> in the
+ <filename>meta-<bsp_name></filename> directory.
+ This file identifies the <filename>meta-<bsp_name></filename>
+ BSP layer as a layer to the build system.</para></listitem>
+ <listitem><para><emphasis>Machine Configuration File:</emphasis>
+ You must include a <filename>conf/machine/<bsp_name>.conf</filename>
+ in the <filename>meta-<bsp_name></filename> directory.
+ This configuration file defines a machine target that can be built
+ using the BSP layer.
+ Multiple machine configuration files define variations of machine
+ configurations that are supported by the BSP.
+ If a BSP supports more multiple machine variations, you need to
+ adequately describe each variation in the BSP
+ <filename>README</filename> file.
+ Do not use multiple machine configuration files to describe disparate
+ hardware.
+ Multiple machine configuration files should describe very similar targets.
+ If you do have very different targets, you should create a separate
+ BSP.
+ <note>It is completely possible for a developer to structure the
+ working repository as a conglomeration of unrelated BSP
+ files, and to possibly generate specifically targeted 'release' BSPs
+ from that directory using scripts or some other mechanism.
+ Such considerations are outside the scope of this document.</note>
+ </para></listitem>
+ </itemizedlist>
+ </para>
+ </section>
+
+ <section id='released-bsp-recommendations'>
+ <title>Released BSP Recommendations</title>
+
+ <para>
+ One recommendation for BSP releases is that they contain
+ one or more bootable images.
+ Including bootable images allows users to easily try out the BSP
+ on their own hardware.
+ </para>
+
+ <para>
+ In some cases, it might not be convenient to include a
+ bootable image.
+ In this case, you might want to make two versions of the
+ BSP available: one that contains binary images, and one
+ that does not.
+ The version that does not contain bootable images avoids
+ unnecessary download times for users not interested in the images.
+ </para>
+
+ <para>
+ If you need to distribute a BSP and include bootable images or build kernel and
+ filesystems meant to allow users to boot the BSP for evaluation
+ purposes, you should put the images and artifacts within a
+ <filename>binary/</filename> subdirectory located in the
+ <filename>meta-<bsp_name></filename> directory.
+ </para>
+ </section>
+ </section>
+
<section id='customizing-a-recipe-for-a-bsp'>
<title>Customizing a Recipe for a BSP</title>
@@ -760,7 +956,7 @@
restart the build to continue where it left off.
During the build, the prompt will not appear again
since you have satisfied the requirement.</para>
- <para>Once the appropriate license flags are whitelisted
+ <para>Once the appropriate license flags are on the white list
in the <filename>LICENSE_FLAGS_WHITELIST</filename> variable, you
can build the encumbered image with no change at all
to the normal build process.</para></listitem>
@@ -931,7 +1127,7 @@
<para>
Now that you know where these two commands reside and how to access information
on them, you should find it relatively straightforward to discover the commands
- necessary to create a BSP and perform basic kernel maintainence on that BSP using
+ necessary to create a BSP and perform basic kernel maintenance on that BSP using
the tools.
The next sections provide a concrete starting point to expand on a few points that
might not be immediately obvious or that could use further explanation.
@@ -990,7 +1186,7 @@
In every other way, this architecture is representative of how creating a BSP for
a 'real' machine would work.
The reason the example uses this architecture is because it is an emulated architecture
- and can easily be followed without requireing actual hardware.
+ and can easily be followed without requiring actual hardware.
</para>
<para>
@@ -1059,7 +1255,7 @@
If you enter 'n', the script prompts you to further enter the kernel
you do want to use (e.g. 3.0, 3.2_preempt-rt, etc.).</para></listitem>
<listitem><para>Next, the script asks whether you would like to have a new
- branch created especially for your BSPin the local
+ branch created especially for your BSP in the local
<ulink url='&YOCTO_DOCS_DEV_URL;#local-kernel-files'>Linux Yocto Kernel</ulink>
Git repository .
If not, then the script re-uses an existing branch.</para>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 10/31] documentation/bsp-guide/bsp.xml: Updates to requirements section
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (8 preceding siblings ...)
2012-06-12 20:40 ` [PATCH 09/31] documentation/bsp-guide/bsp.xml: BSP recommendations section added Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 11/31] rpm 5.4.0: respect to the arch when choose the alternatives Scott Garman
` (22 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Implemented review feedback from Dave Stewart and Tom Zanussi.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/bsp-guide/bsp.xml | 101 +++++++++++++++++++++++----------------
1 file changed, 61 insertions(+), 40 deletions(-)
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 1b5f0f5..e111713 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -670,10 +670,12 @@
<para>
Before looking at BSP requirements, you should consider the following:
<itemizedlist>
- <listitem><para>The requirements here assume the base Yocto Project requirements
- for the BSP layer are already met.
- For example, requirements for working with the
- <filename>oe-core</filename> and standard toolchain layers.</para></listitem>
+ <listitem><para>The requirements here assume the BSP layer is a well-formed, "legal"
+ layer that can be added to the Yocto Project.
+ For guidelines on creating a Yocto Project layer that meets these base requirements, see the
+ "<link linkend='bsp-layers'>BSP Layers</link>" and the
+ "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding
+ and Creating Layers"</ulink> in the Yocto Project Development Manual.</para></listitem>
<listitem><para>The requirements in this section apply regardless of how you
ultimately package a BSP.
You should consult the packaging and distribution guidelines for your
@@ -686,7 +688,7 @@
For example, the BSP metadata can be contained within a Git repository
and could have a directory structure completely different from what appears
in the officially released BSP layer.</para></listitem>
- <listitem><para>No requirement stipulates that specific packages or package
+ <listitem><para>It is not required that specific packages or package
modifications exist in the BSP layer, beyond the requirements for general
compliance with the Yocto Project.
For example, no requirement exists dictating that a specific kernel or
@@ -705,9 +707,16 @@
"<link linkend='bsp-layers'>BSP Layers</link>" section.
</para></listitem>
<listitem><para><emphasis>File System Layout:</emphasis>
- In general, the filesystem layout for the BSP layer
- should use the same directory names
- as listed in <filename>recipes.txt</filename>.
+ When possible, use the same directory names in your
+ BSP layer as listed in the <filename>recipes.txt</filename> file.
+ In particular, you should place recipes
+ (<filename>.bb</filename> files) and recipe
+ modifications (<filename>.bbappend</filename> files) into
+ <filename>recipes-*</filename> subdirectories by functional area
+ as outlined in <filename>recipes.txt</filename>.
+ If you cannot find a category in <filename>recipes.txt</filename>
+ to fit a particular recipe, you can make up your own
+ <filename>recipe-*</filename> subdirectory.
You can find <filename>recipes.txt</filename> in the
<filename>meta</filename> directory of the
<ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto
@@ -715,13 +724,6 @@
(<filename>openembedded-core</filename>) found at
<ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>.
</para>
- <para>In particular, you should place recipes
- (<filename>.bb</filename> files) and recipe
- modifications (<filename>.bbappend</filename> files) into
- <filename>recipes-*</filename> subdirectories by functional area
- as outlined in <filename>recipes.txt</filename>.
- If none of the categories fits a particular recipe, you can
- make up your own <filename>recipe-*</filename> subdirectory.</para>
<para>Within any particular <filename>recipes-*</filename> category, the layout
should match what is found in the OpenEmbedded Core
Git repository (<filename>openembedded-core</filename>)
@@ -739,11 +741,19 @@
<filename>meta-<bsp_name></filename> directory.
This license covers the BSP metadata as a whole.
You must specify which license to use since there is no
- default license if one is not specified.</para></listitem>
+ default license if one is not specified.
+ See the
+ <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fishriver/COPYING.MIT'><filename>COPYING.MIT</filename></ulink>
+ file for the Fish River BSP in the <filename>meta-fishriver</filename> BSP layer
+ as an example.</para></listitem>
<listitem><para><emphasis>README File:</emphasis>
You must include a <filename>README</filename> file in the
<filename>meta-<bsp_name></filename> directory.
- At a minimum, the <filename>README</filename> file should
+ See the
+ <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fishriver/README'><filename>README</filename></ulink>
+ file for the Fish River BSP in the <filename>meta-fishriver</filename> BSP layer
+ as an example.</para>
+ <para>At a minimum, the <filename>README</filename> file should
contain the following:
<itemizedlist>
<listitem><para>A brief description about the hardware the BSP
@@ -779,7 +789,11 @@
<filename>meta-<bsp_name></filename> directory.
This file specifies exactly where you can find the sources used to
generate the binary images contained in the
- <filename>/binary</filename> directory, if present.</para></listitem>
+ <filename>/binary</filename> directory, if present.
+ See the
+ <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fishriver/README.sources'><filename>README.sources</filename></ulink>
+ file for the Fish River BSP in the <filename>meta-fishriver</filename> BSP layer
+ as an example.</para></listitem>
<listitem><para><emphasis>Layer Configuration File:</emphasis>
You must include a <filename>conf/layer.conf</filename> in the
<filename>meta-<bsp_name></filename> directory.
@@ -814,28 +828,35 @@
<title>Released BSP Recommendations</title>
<para>
- One recommendation for BSP releases is that they contain
- one or more bootable images.
- Including bootable images allows users to easily try out the BSP
- on their own hardware.
- </para>
-
- <para>
- In some cases, it might not be convenient to include a
- bootable image.
- In this case, you might want to make two versions of the
- BSP available: one that contains binary images, and one
- that does not.
- The version that does not contain bootable images avoids
- unnecessary download times for users not interested in the images.
- </para>
-
- <para>
- If you need to distribute a BSP and include bootable images or build kernel and
- filesystems meant to allow users to boot the BSP for evaluation
- purposes, you should put the images and artifacts within a
- <filename>binary/</filename> subdirectory located in the
- <filename>meta-<bsp_name></filename> directory.
+ Following are recommendations for a released BSP that conforms to the
+ Yocto Project:
+ <itemizedlist>
+ <listitem><para><emphasis>Bootable Images:</emphasis>
+ BSP releases
+ can contain one or more bootable images.
+ Including bootable images allows users to easily try out the BSP
+ on their own hardware.</para>
+ <para>In some cases, it might not be convenient to include a
+ bootable image.
+ In this case, you might want to make two versions of the
+ BSP available: one that contains binary images, and one
+ that does not.
+ The version that does not contain bootable images avoids
+ unnecessary download times for users not interested in the images.
+ </para>
+ <para>If you need to distribute a BSP and include bootable images or build kernel and
+ filesystems meant to allow users to boot the BSP for evaluation
+ purposes, you should put the images and artifacts within a
+ <filename>binary/</filename> subdirectory located in the
+ <filename>meta-<bsp_name></filename> directory.</para></listitem>
+ <listitem><para><emphasis>Use a Yocto Linux Kernel:</emphasis>
+ Kernel recipes in the BSP should be based on a Yocto Linux kernel.
+ Basing your recipes on these kernels reduces the costs for maintaining
+ the BSP and increases its scalability.
+ See the <filename>Yocto Linux Kernel</filename> category in the
+ <ulink url='&YOCTO_GIT_URL;/cgit.cgi'><filename>Yocto Source Repositories</filename></ulink>
+ for these kernels.</para></listitem>
+ </itemizedlist>
</para>
</section>
</section>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 11/31] rpm 5.4.0: respect to the arch when choose the alternatives
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (9 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 10/31] documentation/bsp-guide/bsp.xml: Updates to requirements section Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 12/31] ncurses: Avoid occasional builling failure when having parallel processable task Scott Garman
` (21 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Robert Yang <liezhi.yang@windriver.com>
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../rpm/rpm/rpm-respect-arch.patch | 67 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
2 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
new file mode 100644
index 0000000..9b63b37
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
@@ -0,0 +1,67 @@
+rpmts.c: respect to the arch priorities
+
+Let rpm respect to the priorities when choose alternatives rpm, the arch
+which comes first is preferred.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ lib/rpmts.c | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/rpmts.c b/lib/rpmts.c
+index 3fbbc9e..40ec08e 100644
+--- a/lib/rpmts.c
++++ b/lib/rpmts.c
+@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data)
+ Header h = NULL;
+ size_t bhnamelen = 0;
+ time_t bhtime = 0;
++ const char *bharch = NULL;
+ rpmTag rpmtag;
+ const char * keyp;
+ size_t keylen = 0;
+@@ -409,6 +410,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ while ((h = rpmmiNext(mi)) != NULL) {
+ size_t hnamelen;
+ time_t htime;
++ const char *harch = NULL;
+
+ if (rpmtag == RPMTAG_PROVIDENAME && !rpmdsAnyMatchesDep(h, ds, 1))
+ continue;
+@@ -431,12 +433,23 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ if (htime <= bhtime)
+ continue;
+
++ /* XXX Respect to the arch priorities */
++ he->tag = RPMTAG_ARCH;
++ xx = headerGet(h, he, 0);
++ harch = ((xx && he->p.str) ? xstrdup(he->p.str) : NULL);
++ he->p.ptr = _free(he->p.ptr);
++ if (bharch && (strcmp(bharch, harch) != 0))
++ continue;
++
+ /* Save new "best" candidate. */
+ (void)headerFree(bh);
+ bh = NULL;
+ bh = headerLink(h);
+ bhtime = htime;
+ bhnamelen = hnamelen;
++ bharch = _free(bharch);
++ bharch = xstrdup(harch);
++ harch = _free(harch);
+ }
+ mi = rpmmiFree(mi);
+
+@@ -449,6 +462,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ } while (1);
+
+ }
++ bharch = _free(bharch);
+
+ /* Is there a suggested resolution? */
+ if (bh == NULL)
+--
+1.7.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 5ee6b47..d79d199 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl file"
extrarpmdeps_virtclass-native = "python-native file-native"
-PR = "r36"
+PR = "r37"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -70,6 +70,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://pythondeps.sh \
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
+ file://rpm-respect-arch.patch \
"
# file://rpm-autoconf.patch \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 12/31] ncurses: Avoid occasional builling failure when having parallel processable task
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (10 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 11/31] rpm 5.4.0: respect to the arch when choose the alternatives Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 13/31] bitbake.conf: Improve wget timeouts Scott Garman
` (20 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
ncurses failure non-gplv3 build (race issue) like the following \
error information:
| tic: error while loading shared libraries: /srv/home/pokybuild \
/yocto-autobuilder/yocto-slave/nightly-non-gpl3/build/build/tmp/\
work/x86_64-linux/ncurses-native-5.9-r8.1/ncurses-5.9/narrowc/lib\
/libtinfo.so.5: file too short
| ? tic could not build /srv/home/pokybuild/yocto-autobuilder/\
yocto-slave/nightly-non-gpl3/build/build/tmp/work/x86_64-linux/\
ncurses-native-5.9-r8.1/image/srv/home/pokybuild/yocto-autobuilder\
/yocto-slave/nightly-non-gpl3/build/build/tmp/sysroots/x86_64-linux\
/usr/share/terminfo
| make[1]: *** [install.data] Error 1
This is a race issue which is caused by
install.libs and install.data:
1) install.data needs run tic
2) tic needs libtinfo.so
3) install.libs would regenerate libtinfo.so
4) but install.data doesn't depend on install.libs, and they can run
parallelly
So there would be errors in a very critical condition: tic is begining
to run at the same time when install.libs is generating libtinfo.so, and
this libtinfo.so is not integrity, then there would be the above error.
Let task install.libs run before install.data for fixing this bug.
[YOCTO #2298]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-core/ncurses/ncurses.inc | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ae99e2c..b031119 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r8"
+INC_PR = "r9"
inherit autotools binconfig multilib_header
@@ -107,10 +107,15 @@ do_test() {
diff curses-narrowc.h curses-widec.h
}
+# Split original _install_opts to two parts.
+# One is the options to install contents, the other is the parameters \
+# when running command "make install"
_install_opts = "\
+ install.libs install.includes install.man \
+"
+_install_cfgs = "\
DESTDIR='${D}' \
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
- install.libs install.includes install.man \
"
python do_install () {
@@ -122,11 +127,19 @@ shell_do_install() {
# Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'.
- oe_runmake -C narrowc ${_install_opts} \
- install.data install.progs
+ oe_runmake -C narrowc ${_install_cfgs} ${_install_opts} \
+ install.progs
+
+ # The install.data should run after install.libs, otherwise
+ # there would be a race issue in a very critical conditon, since
+ # tic will be run by install.data, and tic needs libtinfo.so
+ # which would be regenerated by install.libs.
+ oe_runmake -C narrowc ${_install_cfgs} \
+ install.data
+
! ${ENABLE_WIDEC} || \
- oe_runmake -C widec ${_install_opts}
+ oe_runmake -C widec ${_install_cfgs} ${_install_opts}
cd narrowc
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 13/31] bitbake.conf: Improve wget timeouts
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (11 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 12/31] ncurses: Avoid occasional builling failure when having parallel processable task Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 14/31] sudo: fixed wrong `chmod` path Scott Garman
` (19 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The wget default is a 900 second timeout and 20 retries. This is way too long
for most of our usecases so this patch changes it to a 30 second timeout and
reduces retries from 5 to 2. We have good mirror infrastructure, this will
let us fall back to it easier.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/conf/bitbake.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 56e3e4d..618780c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -559,17 +559,17 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
FETCHCMD_svn = "/usr/bin/env svn"
FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 5 -nv --no-check-certificate"
+FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 -nv --no-check-certificate"
FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCMD_hg = "/usr/bin/env hg"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
-CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 2 -T 30 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 2 -T 30 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
UPDATECOMMAND = "ERROR, this must be a BitBake bug"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 14/31] sudo: fixed wrong `chmod` path
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (12 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 13/31] bitbake.conf: Improve wget timeouts Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 15/31] cooker.py: terminate the Parser processes Scott Garman
` (18 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Mihai Lindner <mihaix.lindner@linux.intel.com>
Placed $D between braces ${D} to be correctly expanded to the
workdir path, instead of a path relative to host rootfs.
Currently, bitbake sudo fails on host systems where sudo is not
installed.
Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
---
meta/recipes-extended/sudo/sudo_1.8.4p4.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
index 2315322..20c4a14 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -24,6 +24,6 @@ do_install_append () {
fi
done
- chmod 4111 $D/usr/bin/sudo
- chmod 0440 $D/etc/sudoers
+ chmod 4111 ${D}/usr/bin/sudo
+ chmod 0440 ${D}/etc/sudoers
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 15/31] cooker.py: terminate the Parser processes
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (13 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 14/31] sudo: fixed wrong `chmod` path Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 16/31] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation Scott Garman
` (17 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Kang Kai <kai.kang@windriver.com>
[Yocto 2142]
Force to exit HOB when hob is parsing recipes, the bitbake doesn't stop.
It hangs on function BitBakeServerConnection::terminate in file
server/process.py:
else:
self.procserver.join()
It is waiting for the children process quit.
In stage of parse recipes BBCooker spawns Parser processes as many as
cpu numbers. When quit the Parser processes they make their internal
Queue to call cancel_join_thread() to avoid block but don't work at
this time.
So force to terminate the Parser processes.
(Bitbake rev: bebef58b21bdff7a3ee1fa2449b7df19144f26fd)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
bitbake/lib/bb/cooker.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index dea0aad..4a4dc38 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1175,7 +1175,7 @@ class BBCooker:
return
if self.state in (state.shutdown, state.stop):
- self.parser.shutdown(clean=False)
+ self.parser.shutdown(clean=False, force = True)
sys.exit(1)
if self.state != state.parsing:
@@ -1608,10 +1608,13 @@ class CookerParser(object):
self.parser_quit.put(None)
self.jobs.cancel_join_thread()
- sys.exit(1)
for process in self.processes:
- process.join()
+ if force:
+ process.join(.1)
+ process.terminate()
+ else:
+ process.join()
self.feeder.join()
sync = threading.Thread(target=self.bb_cache.sync)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 16/31] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (14 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 15/31] cooker.py: terminate the Parser processes Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 17/31] sanity.bbclass: copy the data store and finalise before running checks Scott Garman
` (16 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Some image classes such as bootimg save files into ${S} as part of rootfs
generation. For correctness we should therefore clean this at the start of
image generation to ensure reproducibility.
I found this issue when some files I thought should disappear from my rootfs
would not disappear.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/image.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59b..9557433 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -131,6 +131,7 @@ PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
+do_rootfs[cleandirs] += "${S}"
do_build[nostamp] = "1"
# Must call real_do_rootfs() from inside here, rather than as a separate
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 17/31] sanity.bbclass: copy the data store and finalise before running checks
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (15 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 16/31] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 18/31] classes/sanity: send sanity check failure as a separate event for Hob Scott Garman
` (15 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Joshua Lock <josh@linux.intel.com>
At the ConfigParsed event the datastore has yet to be finalised and thus
appends and overrides have not been set.
To ensure the sanity check is being run against the configuration values
the user has set call finalize() on a copy of the datastore and pass that
for all sanity checks.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/classes/sanity.bbclass | 127 +++++++++++++++++++++++--------------------
1 file changed, 68 insertions(+), 59 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 687ddeb..0c2fa04 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -112,8 +112,8 @@ def check_connectivity(d):
return retval
-def check_supported_distro(e):
- tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+def check_supported_distro(sanity_data):
+ tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS', True)
if not tested_distros:
return
@@ -160,26 +160,26 @@ def check_supported_distro(e):
bb.warn('Host distribution could not be determined; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.')
# Checks we should only make if MACHINE is set correctly
-def check_sanity_validmachine(e):
+def check_sanity_validmachine(sanity_data):
from bb import data
messages = ""
# Check TUNE_ARCH is set
- if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID':
+ if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE configuration includes a valid tune configuration file which will set this correctly.\n'
# Check TARGET_ARCH is set correctly
- if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
+ if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by your MACHINE configuration files.\nPlease use a valid tune configuration file which should set this correctly automatically\nand avoid setting this in the machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
- if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+ if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS
- pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
- tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+ pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
+ tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
tunefound = False
seen = {}
dups = []
@@ -201,7 +201,7 @@ def check_sanity_validmachine(e):
return messages
-def check_sanity(e):
+def check_sanity(sanity_data):
from bb import note, error, data, __version__
try:
@@ -211,7 +211,7 @@ def check_sanity(e):
import commands
# Check the bitbake version meets minimum requirements
- minversion = data.getVar('BB_MIN_VERSION', e.data , True)
+ minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -233,42 +233,42 @@ def check_sanity(e):
messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
- if data.getVar('MACHINE', e.data, True):
- if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+ if data.getVar('MACHINE', sanity_data, True):
+ if not check_conf_exists("conf/machine/${MACHINE}.conf", sanity_data):
messages = messages + 'Please set a valid MACHINE in your local.conf or environment\n'
else:
- messages = messages + check_sanity_validmachine(e)
+ messages = messages + check_sanity_validmachine(sanity_data)
else:
messages = messages + 'Please set a MACHINE in your local.conf or environment\n'
# Check we are using a valid lacal.conf
- current_conf = data.getVar('CONF_VERSION', e.data, True)
- conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
+ current_conf = data.getVar('CONF_VERSION', sanity_data, True)
+ conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
if current_conf != conf_version:
messages = messages + "Your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
# Check bblayers.conf is valid
- current_lconf = data.getVar('LCONF_VERSION', e.data, True)
- lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
+ current_lconf = data.getVar('LCONF_VERSION', sanity_data, True)
+ lconf_version = data.getVar('LAYER_CONF_VERSION', sanity_data, True)
if current_lconf != lconf_version:
messages = messages + "Your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
# If we have a site.conf, check it's valid
- if check_conf_exists("conf/site.conf", e.data):
- current_sconf = data.getVar('SCONF_VERSION', e.data, True)
- sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
+ if check_conf_exists("conf/site.conf", sanity_data):
+ current_sconf = data.getVar('SCONF_VERSION', sanity_data, True)
+ sconf_version = data.getVar('SITE_CONF_VERSION', sanity_data, True)
if current_sconf != sconf_version:
messages = messages + "Your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
- assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
+ assume_provided = data.getVar('ASSUME_PROVIDED', sanity_data , True).split()
# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
if "diffstat-native" not in assume_provided:
messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
# Check that DL_DIR is set, exists and is writable. In theory, we should never even hit the check if DL_DIR isn't
# set, since so much relies on it being set.
- dldir = data.getVar('DL_DIR', e.data, True)
+ dldir = data.getVar('DL_DIR', sanity_data, True)
if not dldir:
messages = messages + "DL_DIR is not set. Your environment is misconfigured, check that DL_DIR is set, and if the directory exists, that it is writable. \n"
if os.path.exists(dldir) and not os.access(dldir, os.W_OK):
@@ -276,32 +276,32 @@ def check_sanity(e):
# Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
- distro = data.getVar('DISTRO', e.data, True)
+ distro = data.getVar('DISTRO', sanity_data, True)
if distro:
- if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
- messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
+ if not ( check_conf_exists("conf/distro/${DISTRO}.conf", sanity_data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", sanity_data) ):
+ messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", sanity_data, True )
missing = ""
- if not check_app_exists("${MAKE}", e.data):
+ if not check_app_exists("${MAKE}", sanity_data):
missing = missing + "GNU make,"
- if not check_app_exists('${BUILD_PREFIX}gcc', e.data):
- missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", e.data, True)
+ if not check_app_exists('${BUILD_PREFIX}gcc', sanity_data):
+ missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", sanity_data, True)
- if not check_app_exists('${BUILD_PREFIX}g++', e.data):
- missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
+ if not check_app_exists('${BUILD_PREFIX}g++', sanity_data):
+ missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", sanity_data, True)
- required_utilities = e.data.getVar('SANITY_REQUIRED_UTILITIES', True)
+ required_utilities = sanity_data.getVar('SANITY_REQUIRED_UTILITIES', True)
if "qemu-native" in assume_provided:
- if not check_app_exists("qemu-arm", e.data):
+ if not check_app_exists("qemu-arm", sanity_data):
messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
- if "." in data.getVar('PATH', e.data, True).split(":"):
+ if "." in data.getVar('PATH', sanity_data, True).split(":"):
messages = messages + "PATH contains '.' which will break the build, please remove this"
- if data.getVar('TARGET_ARCH', e.data, True) == "arm":
+ if data.getVar('TARGET_ARCH', sanity_data, True) == "arm":
# This path is no longer user-readable in modern (very recent) Linux
try:
if os.path.exists("/proc/sys/vm/mmap_min_addr"):
@@ -315,7 +315,7 @@ def check_sanity(e):
pass
for util in required_utilities.split():
- if not check_app_exists( util, e.data ):
+ if not check_app_exists( util, sanity_data ):
missing = missing + "%s," % util
if missing != "":
@@ -326,10 +326,10 @@ def check_sanity(e):
if pseudo_msg != "":
messages = messages + pseudo_msg + '\n'
- check_supported_distro(e)
+ check_supported_distro(sanity_data)
# Check if DISPLAY is set if IMAGETEST is set
- if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
+ if not data.getVar( 'DISPLAY', sanity_data, True ) and data.getVar( 'IMAGETEST', sanity_data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
omask = os.umask(022)
@@ -337,11 +337,11 @@ def check_sanity(e):
messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
os.umask(omask)
- oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
+ oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', sanity_data, True )
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
- nolibs = data.getVar('NO32LIBS', e.data, True)
+ nolibs = data.getVar('NO32LIBS', sanity_data, True)
if not nolibs:
lib32path = '/lib'
if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
@@ -350,8 +350,8 @@ def check_sanity(e):
if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
messages = messages + "You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n"
- tmpdir = data.getVar('TMPDIR', e.data, True)
- sstate_dir = data.getVar('SSTATE_DIR', e.data, True)
+ tmpdir = data.getVar('TMPDIR', sanity_data, True)
+ sstate_dir = data.getVar('SSTATE_DIR', sanity_data, True)
# Check saved sanity info
last_sanity_version = 0
@@ -368,16 +368,16 @@ def check_sanity(e):
if line.startswith('SSTATE_DIR'):
last_sstate_dir = line.split()[1]
- sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1)
+ sanity_version = int(data.getVar('SANITY_VERSION', sanity_data, True) or 1)
if last_sanity_version < sanity_version:
- messages = messages + check_sanity_version_change(e.data)
- messages = messages + check_sanity_tmpdir_change(tmpdir, e.data)
- messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
+ messages = messages + check_sanity_version_change(sanity_data)
+ messages = messages + check_sanity_tmpdir_change(tmpdir, sanity_data)
+ messages = messages + check_sanity_sstate_dir_change(sstate_dir, sanity_data)
else:
if last_tmpdir != tmpdir:
- messages = messages + check_sanity_tmpdir_change(tmpdir, e.data)
+ messages = messages + check_sanity_tmpdir_change(tmpdir, sanity_data)
if last_sstate_dir != sstate_dir:
- messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
+ messages = messages + check_sanity_sstate_dir_change(sstate_dir, sanity_data)
if os.path.exists("conf") and not messages:
f = file(sanityverfile, 'w')
@@ -402,8 +402,8 @@ def check_sanity(e):
#
# Check the 'ABI' of TMPDIR
#
- current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
- abifile = data.getVar('SANITY_ABIFILE', e.data, True)
+ current_abi = data.getVar('OELAYOUT_ABI', sanity_data, True)
+ abifile = data.getVar('SANITY_ABIFILE', sanity_data, True)
if os.path.exists(abifile):
f = file(abifile, "r")
abi = f.read().strip()
@@ -412,16 +412,16 @@ def check_sanity(e):
f.write(current_abi)
elif abi == "2" and current_abi == "3":
bb.note("Converting staging from layout version 2 to layout version 3")
- os.system(e.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots"))
- os.system(e.data.expand("ln -s sysroots ${TMPDIR}/staging"))
- os.system(e.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done"))
+ os.system(sanity_data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots"))
+ os.system(sanity_data.expand("ln -s sysroots ${TMPDIR}/staging"))
+ os.system(sanity_data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done"))
f = file(abifile, "w")
f.write(current_abi)
elif abi == "3" and current_abi == "4":
bb.note("Converting staging layout from version 3 to layout version 4")
- if os.path.exists(e.data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}")):
- os.system(e.data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}"))
- os.system(e.data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"))
+ if os.path.exists(sanity_data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}")):
+ os.system(sanity_data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}"))
+ os.system(sanity_data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"))
f = file(abifile, "w")
f.write(current_abi)
@@ -429,7 +429,7 @@ def check_sanity(e):
messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
elif abi == "5" and current_abi == "6":
bb.note("Converting staging layout from version 5 to layout version 6")
- os.system(e.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}"))
+ os.system(sanity_data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}"))
f = file(abifile, "w")
f.write(current_abi)
elif abi == "7" and current_abi == "8":
@@ -442,7 +442,7 @@ def check_sanity(e):
f.write(current_abi)
f.close()
- oeroot = data.getVar('COREBASE', e.data)
+ oeroot = data.getVar('COREBASE', sanity_data)
if oeroot.find ('+') != -1:
messages = messages + "Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include a +."
elif oeroot.find (' ') != -1:
@@ -451,12 +451,21 @@ def check_sanity(e):
if messages != "":
raise_sanity_error(messages)
+# Create a copy of the datastore and finalise it to ensure appends and
+# overrides are set - the datastore has yet to be finalised at ConfigParsed
+def copy_data(e):
+ sanity_data = bb.data.createCopy(e.data)
+ sanity_data.finalize()
+ return sanity_data
+
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1" and e.data.getVar("DISABLE_SANITY_CHECKS", True) != "1":
- check_sanity(e)
+ sanity_data = copy_data(e)
+ check_sanity(sanity_data)
elif bb.event.getName(e) == "SanityCheck":
- check_sanity(e)
+ sanity_data = copy_data(e)
+ check_sanity(sanity_data)
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
return
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 18/31] classes/sanity: send sanity check failure as a separate event for Hob
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (16 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 17/31] sanity.bbclass: copy the data store and finalise before running checks Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 19/31] hob: handle sanity check failures as a separate event Scott Garman
` (14 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Paul Eggleton <paul.eggleton@linux.intel.com>
In order to show a friendlier error message within Hob that does not
bury the actual sanity error in our typical preamble about disabling
sanity checks, use a separate event to indicate that sanity checks
failed.
This change is intended to work together with the related change to
BitBake, however it has a check to ensure that it does not fail with
older versions that do not include that change.
Fixes [YOCTO #2336].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/sanity.bbclass | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 0c2fa04..9755694 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -4,7 +4,16 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio"
-def raise_sanity_error(msg):
+def raise_sanity_error(msg, d):
+ if d.getVar("SANITY_USE_EVENTS", True) == "1":
+ # FIXME: handle when BitBake version is too old to support bb.event.SanityCheckFailed
+ # We can just fire the event directly once the minimum version is bumped beyond 1.15.1
+ try:
+ bb.event.fire(bb.event.SanityCheckFailed(msg), d)
+ return
+ except AttributeError:
+ pass
+
bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
Following is the list of potential problems / advisories:
@@ -219,7 +228,7 @@ def check_sanity(sanity_data):
return
if 0 == os.getuid():
- raise_sanity_error("Do not use Bitbake as root.")
+ raise_sanity_error("Do not use Bitbake as root.", sanity_data)
messages = ""
@@ -449,7 +458,7 @@ def check_sanity(sanity_data):
messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space."
if messages != "":
- raise_sanity_error(messages)
+ raise_sanity_error(messages, sanity_data)
# Create a copy of the datastore and finalise it to ensure appends and
# overrides are set - the datastore has yet to be finalised at ConfigParsed
@@ -465,6 +474,7 @@ python check_sanity_eventhandler() {
check_sanity(sanity_data)
elif bb.event.getName(e) == "SanityCheck":
sanity_data = copy_data(e)
+ sanity_data.setVar("SANITY_USE_EVENTS", "1")
check_sanity(sanity_data)
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 19/31] hob: handle sanity check failures as a separate event
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (17 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 18/31] classes/sanity: send sanity check failure as a separate event for Hob Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 20/31] webkit-gtk: Use glib as unicode backend to avoid browser crash Scott Garman
` (13 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Paul Eggleton <paul.eggleton@linux.intel.com>
In order to show a friendlier error message that does not bury the
actual sanity error in our typical preamble about disabling sanity
checks, use a separate event to indicate that sanity checks failed.
This change is intended to work together with the related change to
sanity.bbclass in OE-Core.
Fixes [YOCTO #2336].
(Bitbake rev: 24b631acdaa143a4de39c6e1328849660c66f219)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
bitbake/lib/bb/event.py | 8 ++++++++
bitbake/lib/bb/ui/crumbs/builder.py | 7 ++++++-
bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 6 ++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index f3fb521..1116c0a 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -527,3 +527,11 @@ class SanityCheckPassed(Event):
"""
Event to indicate sanity check is passed
"""
+
+class SanityCheckFailed(Event):
+ """
+ Event to indicate sanity check has failed
+ """
+ def __init__(self, msg):
+ Event.__init__(self)
+ self._msg = msg
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 3f68782..df85326 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -354,6 +354,7 @@ class Builder(gtk.Window):
self.handler.connect("data-generated", self.handler_data_generated_cb)
self.handler.connect("command-succeeded", self.handler_command_succeeded_cb)
self.handler.connect("command-failed", self.handler_command_failed_cb)
+ self.handler.connect("sanity-failed", self.handler_sanity_failed_cb)
self.handler.connect("recipe-populated", self.handler_recipe_populated_cb)
self.handler.connect("package-populated", self.handler_package_populated_cb)
@@ -652,10 +653,14 @@ class Builder(gtk.Window):
def handler_command_failed_cb(self, handler, msg):
if msg:
- msg = msg.replace("your local.conf", "Settings")
self.show_error_dialog(msg)
self.reset()
+ def handler_sanity_failed_cb(self, handler, msg):
+ msg = msg.replace("your local.conf", "Settings")
+ self.show_error_dialog(msg)
+ self.reset()
+
def window_sensitive(self, sensitive):
self.image_configuration_page.machine_combo.set_sensitive(sensitive)
self.image_configuration_page.image_combo.set_sensitive(sensitive)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 424bcfa..74138cb 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -42,6 +42,9 @@ class HobHandler(gobject.GObject):
"command-failed" : (gobject.SIGNAL_RUN_LAST,
gobject.TYPE_NONE,
(gobject.TYPE_STRING,)),
+ "sanity-failed" : (gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ (gobject.TYPE_STRING,)),
"generating-data" : (gobject.SIGNAL_RUN_LAST,
gobject.TYPE_NONE,
()),
@@ -170,6 +173,9 @@ class HobHandler(gobject.GObject):
elif isinstance(event, bb.event.SanityCheckPassed):
self.run_next_command()
+ elif isinstance(event, bb.event.SanityCheckFailed):
+ self.emit("sanity-failed", event._msg)
+
elif isinstance(event, logging.LogRecord):
if event.levelno >= logging.ERROR:
self.error_msg += event.msg + '\n'
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 20/31] webkit-gtk: Use glib as unicode backend to avoid browser crash
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (18 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 19/31] hob: handle sanity check failures as a separate event Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 21/31] gnupg: add libusb to DEPENDS Scott Garman
` (12 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Zhai Edwin <edwin.zhai@intel.com>
webkit-gtk depends on ICU for the unicode, but ICU is not safe when build and
target system owns different endian. ICU's community is not responsive to make
a patch for this, so glib is used as work around here.
[YOCTO #1570] got fixed
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 7db573d..9381486 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
+DEPENDS_append_qemuppc += "pango"
SRCREV_FORMAT = "source"
SRCREV = "101488"
PV = "1.7.2+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -47,6 +48,13 @@ EXTRA_OECONF = "\
UNICODE_CFLAGS=-D_REENTRANT \
"
+#default unicode backend icu breaks in cross-compile when target and host owns different endian type
+EXTRA_OECONF_append_qemuppc += "--with-unicode-backend=glib"
+
+CPPFLAGS_append_qemuppc += "-I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_LIBDIR}/glib-2.0/include \
+ -I${STAGING_INCDIR}/glib-2.0"
+
EXTRA_AUTORECONF = " -I Source/autotools "
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 21/31] gnupg: add libusb to DEPENDS
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (19 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 20/31] webkit-gtk: Use glib as unicode backend to avoid browser crash Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 22/31] gnupg: disable CCID driver Scott Garman
` (11 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
gnupg apparently depends on libusb:
| error: Failed dependencies:
| libusb-0.1-4 >= 0.1.3 is needed by gnupg-2.0.18-r1.core2
So add libusb to gnupg DEPENDS.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts when importing from oe-core master.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 3085494..7dfd908 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
-PR = "r1"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
+PR = "r2"
inherit autotools gettext
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 22/31] gnupg: disable CCID driver
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (20 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 21/31] gnupg: add libusb to DEPENDS Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 23/31] runqemu-ifup: enable arp proxying Scott Garman
` (10 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
The CCID driver driver is apparently unnecessary, so disable it.
Also remove the associated libusb dependency, since that won't be
needed either.
According to Scott Garman <scott.a.garman@intel.com>:
I'd just note that the CCID smartcard reader is a specific piece of
hardware that is unlikely to be used in a majority of our use cases.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts when importing from oe-core master.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 7dfd908..54be88d 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
-PR = "r2"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
+PR = "r3"
inherit autotools gettext
@@ -15,6 +15,7 @@ SRC_URI[md5sum] = "2f37e0722666a0fedbe4d9f9227ac4d7"
SRC_URI[sha256sum] = "48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b"
EXTRA_OECONF = "--disable-ldap \
+ --disable-ccid-driver \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-bzip2=${STAGING_LIBDIR}/.. \
--with-readline=${STAGING_LIBDIR}/.. \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 23/31] runqemu-ifup: enable arp proxying
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (21 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 22/31] gnupg: disable CCID driver Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 24/31] beecrypt: disable java Scott Garman
` (9 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
This allows core-image-sato to access the WAN.
Thanks to Dexuan Cui for proposing this fix.
Fixes [YOCTO #2329]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
scripts/runqemu-ifup | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index f80538f..1f1b4c8 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -103,6 +103,7 @@ $ROUTE add -host 192.168.7.$dest $TAP
$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32
$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32
echo 1 > /proc/sys/net/ipv4/ip_forward
+echo 1 > /proc/sys/net/ipv4/conf/$TAP/proxy_arp
$IPTABLES -P FORWARD ACCEPT
echo $TAP
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 24/31] beecrypt: disable java
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (22 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 23/31] runqemu-ifup: enable arp proxying Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 25/31] groff: Fix build on Fedora 17 Scott Garman
` (8 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Jesse Zhang <sen.zhang@windriver.com>
If java is installed on host, beecrypt will attempt to use it.
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 2913b46..2b2b348 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
DEPENDS = "icu"
-PR = "r1"
+PR = "r2"
inherit autotools multilib_header
acpaths=""
@@ -26,7 +26,7 @@ do_install_append() {
oe_multilib_header beecrypt/gnu.h
}
-EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
+EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp --with-java=no"
FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 25/31] groff: Fix build on Fedora 17
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (23 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 24/31] beecrypt: disable java Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 26/31] shared-mime-info: fix build race condition Scott Garman
` (7 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: "Song.Li" <Song.Li@windriver.com>
Generally distros keep perl at /usr/bin/perl
But Fedora 17 also has /bin/perl,
this causes groff_1.20.1 build to put perl
interpreter path as /bin/perl
But we set perl location for target as /usr/bin/perl
This mismatch of perl path causes failure of rootfs image creation
like this:
| error: Failed dependencies:
| bin/perl is needed by groff-1.20.1-r1.ppc603e
Signed-off-by: Song.Li <song.li@windriver.com>
Sync up with the do_install_append_virtclass-native chunk.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/groff/groff_1.20.1.bb | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index 6cb72bf..ef22548 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -4,7 +4,7 @@ formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -18,6 +18,10 @@ DEPENDS_virtclass-native = ""
inherit autotools
+PERLPATH = "${bindir}/perl"
+PERLPATH_virtclass-native = "/usr/bin/env perl"
+PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
+
EXTRA_OECONF = "--without-x"
PARALLEL_MAKE = ""
@@ -34,7 +38,25 @@ do_configure_prepend() {
fi
}
+do_install_append() {
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ for i in afmtodit mmroff; do
+ if [ -f ${D}${bindir}/$i ]; then
+ sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i
+ fi
+ done
+}
+
do_install_append_virtclass-native() {
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ for i in afmtodit mmroff; do
+ if [ -f ${D}${bindir}/$i ]; then
+ sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i
+ fi
+ done
+
create_cmdline_wrapper ${D}/${bindir}/groff \
-F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \
-M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 26/31] shared-mime-info: fix build race condition
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (24 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 25/31] groff: Fix build on Fedora 17 Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 27/31] gitignore: add wildcard to match toplevel patch files Scott Garman
` (6 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Joe Slater <jslater@windriver.com>
The definition of install-data-hook in Makefile.am leads
to multiple, overlapping, executions of the install-binPROGRAMS
target. We modify the definition to avoid that.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../shared-mime-info/install-data-hook.patch | 21 ++++++++++++++++++++
.../shared-mime-info/shared-mime-info_0.91.bb | 5 +++--
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
new file mode 100644
index 0000000..4c075f2
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
@@ -0,0 +1,21 @@
+fix shared-mime-info build race condition
+
+The definition of install-data-hook in Makefile.am leads
+to multiple, overlapping, executions of install-binPROGRAMS
+target. We modify the definition to avoid that.
+
+Signed-off-by: Joe Slater <jslater@windriver.com>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
+ @INTLTOOL_XML_RULE@
+ @INTLTOOL_DESKTOP_RULE@
+
+-install-data-hook: install-binPROGRAMS
++# do NOT make this dependent on anything!
++#
++install-data-hook:
+ if ENABLE_UPDATE_MIMEDB
+ $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
+ endif
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 7ae6e10..910cb7f 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -1,7 +1,8 @@
require shared-mime-info.inc
-PR = "r3"
+PR = "r4"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
-SRC_URI =+ "file://parallelmake.patch"
+SRC_URI =+ "file://parallelmake.patch \
+ file://install-data-hook.patch"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 27/31] gitignore: add wildcard to match toplevel patch files
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (25 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 26/31] shared-mime-info: fix build race condition Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 28/31] freetype: upgrade to 2.4.9 Scott Garman
` (5 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To support the basic workflow of trivial patches:
git format-patch HEAD~.. ; git send-email --to foo@bar.com 0001-foo.patch
We don't want git status reporting on patches lying in the top
level dir in this case.
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: f9c2d97d549e848127b741b967d90288c60f4d43)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 04e36c5..f8db092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.pyc
*.pyo
+/*.patch
build*/conf/local.conf
build*/conf/bblayers.conf
build*/downloads
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 28/31] freetype: upgrade to 2.4.9
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (26 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 27/31] gitignore: add wildcard to match toplevel patch files Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 29/31] poky.conf: use correct version string for Ubuntu 12.04 Scott Garman
` (4 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
(From OE-Core rev: 6dc49f00248ffb937de45c4d075907774b4cd8fc)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../no-hardcode.patch | 0
.../{freetype_2.4.8.bb => freetype_2.4.9.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/freetype/{freetype-2.4.8 => freetype-2.4.9}/no-hardcode.patch (100%)
rename meta/recipes-graphics/freetype/{freetype_2.4.8.bb => freetype_2.4.9.bb} (91%)
diff --git a/meta/recipes-graphics/freetype/freetype-2.4.8/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch
similarity index 100%
rename from meta/recipes-graphics/freetype/freetype-2.4.8/no-hardcode.patch
rename to meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.8.bb b/meta/recipes-graphics/freetype/freetype_2.4.9.bb
similarity index 91%
rename from meta/recipes-graphics/freetype/freetype_2.4.8.bb
rename to meta/recipes-graphics/freetype/freetype_2.4.9.bb
index bce01cf..31bee80 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.8.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.9.bb
@@ -18,8 +18,8 @@ PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
file://no-hardcode.patch"
-SRC_URI[md5sum] = "dbf2caca1d3afd410a29217a9809d397"
-SRC_URI[sha256sum] = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"
+SRC_URI[md5sum] = "77a893dae81fd5b896632715ca041179"
+SRC_URI[sha256sum] = "c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9"
S = "${WORKDIR}/freetype-${PV}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 29/31] poky.conf: use correct version string for Ubuntu 12.04
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (27 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 28/31] freetype: upgrade to 2.4.9 Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 30/31] documentation/bsp-guide/bsp.xml: Review comments to recommendations Scott Garman
` (3 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Since it is an LTS release, the final version string was not
"Ubuntu 12.04" but "Ubuntu 12.04 LTS", so use this when doing the tested
host distribution check.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta-yocto/conf/distro/poky.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index e9dbcc7..3ac494e 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -69,7 +69,7 @@ SANITY_TESTED_DISTROS ?= " \
Yocto (Built by Poky 7.0) 1.2 \n \
Ubuntu 10.04.4 LTS \n \
Ubuntu 11.10 \n \
- Ubuntu 12.04 \n \
+ Ubuntu 12.04 LTS \n \
Fedora release 15 (Lovelock) \n \
Fedora release 16 (Verne) \n \
Fedora release 17 (Beefy Miracle) \n \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 30/31] documentation/bsp-guide/bsp.xml: Review comments to recommendations
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (28 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 29/31] poky.conf: use correct version string for Ubuntu 12.04 Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-12 20:41 ` [PATCH 31/31] documentation/poky.ent: Updated variables for correct 1.2.1 build Scott Garman
` (2 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
I added a small review comment to the section based on reviewer
feedback.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/bsp-guide/bsp.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index e111713..6fd61c0 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -848,7 +848,12 @@
filesystems meant to allow users to boot the BSP for evaluation
purposes, you should put the images and artifacts within a
<filename>binary/</filename> subdirectory located in the
- <filename>meta-<bsp_name></filename> directory.</para></listitem>
+ <filename>meta-<bsp_name></filename> directory.
+ <note>If you do include a bootable image as part of the BSP and the image
+ was built by software covered by the GPL or other open source licenses,
+ it is your responsibility to understand
+ and meet all licensing requirements, which could include distribution
+ of source files.</note></para></listitem>
<listitem><para><emphasis>Use a Yocto Linux Kernel:</emphasis>
Kernel recipes in the BSP should be based on a Yocto Linux kernel.
Basing your recipes on these kernels reduces the costs for maintaining
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 31/31] documentation/poky.ent: Updated variables for correct 1.2.1 build.
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (29 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 30/31] documentation/bsp-guide/bsp.xml: Review comments to recommendations Scott Garman
@ 2012-06-12 20:41 ` Scott Garman
2012-06-13 16:10 ` RFC: [PATCH 00/31] denzil pull request Scott Garman
2012-06-14 10:32 ` Richard Purdie
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-12 20:41 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Key variables are DISTRO at "1.2.1", YOCTO_DOC_VERSION at "current",
and POKYVERSION at "7.0.1". Note that I have to change "current"
to "1.2.1" before publishing any manuals prior to the official release
of 1.2.1.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/poky.ent | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/documentation/poky.ent b/documentation/poky.ent
index bc00de8..aec1391 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,7 +1,7 @@
-<!ENTITY DISTRO "1.2">
+<!ENTITY DISTRO "1.2.1">
<!ENTITY DISTRO_NAME "denzil">
<!ENTITY YOCTO_DOC_VERSION "current">
-<!ENTITY POKYVERSION "7.0">
+<!ENTITY POKYVERSION "7.0.1">
<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
<!ENTITY COPYRIGHT_YEAR "2010-2012">
<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
--
1.7.9.5
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: RFC: [PATCH 00/31] denzil pull request
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (30 preceding siblings ...)
2012-06-12 20:41 ` [PATCH 31/31] documentation/poky.ent: Updated variables for correct 1.2.1 build Scott Garman
@ 2012-06-13 16:10 ` Scott Garman
2012-06-14 10:32 ` Richard Purdie
32 siblings, 0 replies; 34+ messages in thread
From: Scott Garman @ 2012-06-13 16:10 UTC (permalink / raw)
To: poky
On 06/12/2012 01:40 PM, Scott Garman wrote:
> 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.
>
> I'm submitting this as an RFC so the community can offer feedback as
> soon as possible. I'm planning on running this through the Yocto
> autobuilder tonight and will reply to this thread with test results.
> Assuming we get green builds, the goal is to get this pull request
> merged into poky's denzil branch fairly quickly, so please speak
> up if you have any comments or concerns with these commits.
Autobuilder test results are in:
nightly:
http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/509
We appear to have a package_index failure:
http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/509/steps/shell_45/logs/stdio
I'll file a bug for this after confirming some things with Beth.
nightly-non-gpl3:
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/105
nightly-tiny:
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/86
nightly-meta-intel:
http://autobuilder.yoctoproject.org:8010/builders/nightly-meta-intel/builds/101
Scott
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: RFC: [PATCH 00/31] denzil pull request
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
` (31 preceding siblings ...)
2012-06-13 16:10 ` RFC: [PATCH 00/31] denzil pull request Scott Garman
@ 2012-06-14 10:32 ` Richard Purdie
32 siblings, 0 replies; 34+ messages in thread
From: Richard Purdie @ 2012-06-14 10:32 UTC (permalink / raw)
To: Scott Garman; +Cc: poky
On Tue, 2012-06-12 at 13:40 -0700, Scott Garman wrote:
> 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.
>
> I'm submitting this as an RFC so the community can offer feedback as
> soon as possible. I'm planning on running this through the Yocto
> autobuilder tonight and will reply to this thread with test results.
> Assuming we get green builds, the goal is to get this pull request
> merged into poky's denzil branch fairly quickly, so please speak
> up if you have any comments or concerns with these commits.
>
> 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
>
> Dongxiao Xu (1):
> Hob: Clear the building status if command failed
>
> Jesse Zhang (1):
> beecrypt: disable java
>
> Joe Slater (1):
> shared-mime-info: fix build race condition
>
> Joshua Lock (1):
> sanity.bbclass: copy the data store and finalise before running
> checks
>
> Kang Kai (1):
> cooker.py: terminate the Parser processes
>
> Laurentiu Palcu (1):
> freetype: upgrade to 2.4.9
>
> 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
>
> Mihai Lindner (1):
> sudo: fixed wrong `chmod` path
>
> Paul Eggleton (3):
> classes/sanity: send sanity check failure as a separate event for Hob
> hob: handle sanity check failures as a separate event
> poky.conf: use correct version string for Ubuntu 12.04
>
> Paul Gortmaker (1):
> gitignore: add wildcard to match toplevel patch files
>
> Richard Purdie (4):
> netbase: Correctly set FILESEXTRAPATHS to include the version
> Update version to 1.15.2 (correspdoning to Yocto 1.2 release)
> bitbake.conf: Improve wget timeouts
> image.bbclass: Ensure ${S} is cleaned at the start of rootfs
> generation
>
> Robert Yang (1):
> rpm 5.4.0: respect to the arch when choose the alternatives
>
> Scott Garman (1):
> runqemu-ifup: enable arp proxying
>
> Scott Rifenbark (4):
> documentation/bsp-guide/bsp.xml: BSP recommendations section added
> documentation/bsp-guide/bsp.xml: Updates to requirements section
> documentation/bsp-guide/bsp.xml: Review comments to recommendations
> documentation/poky.ent: Updated variables for correct 1.2.1 build.
>
> Shane Wang (1):
> Hob: Adjust the progress bar and set 100% only when all is done.
>
> Song.Li (1):
> groff: Fix build on Fedora 17
>
> Tom Zanussi (4):
> yocto-kernel: use BUILDDIR to find bblayers.conf
> yocto-bsp: clarify help with reference to meta-intel
> gnupg: add libusb to DEPENDS
> gnupg: disable CCID driver
>
> Xiaofeng Yan (1):
> ncurses: Avoid occasional builling failure when having parallel
> processable task
>
> Zhai Edwin (1):
> webkit-gtk: Use glib as unicode backend to avoid browser crash
Merged to poky's denzil branch, thanks.
I did get a little confused here as some of these appeared to have
already been merged but I think I've got it right...
Cheers,
Richard
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2012-06-14 10:32 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 20:40 RFC: [PATCH 00/31] denzil pull request Scott Garman
2012-06-12 20:40 ` [PATCH 01/31] netbase: Correctly set FILESEXTRAPATHS to include the version Scott Garman
2012-06-12 20:40 ` [PATCH 02/31] yocto-kernel: use BUILDDIR to find bblayers.conf Scott Garman
2012-06-12 20:40 ` [PATCH 03/31] yocto-bsp: clarify help with reference to meta-intel Scott Garman
2012-06-12 20:40 ` [PATCH 04/31] Hob: Clear the building status if command failed Scott Garman
2012-06-12 20:40 ` [PATCH 05/31] Hob: change the refresh icon speed to make it view clear Scott Garman
2012-06-12 20:40 ` [PATCH 06/31] Hob: add original url show function with the tooltip hyperlink for user Scott Garman
2012-06-12 20:40 ` [PATCH 07/31] Update version to 1.15.2 (correspdoning to Yocto 1.2 release) Scott Garman
2012-06-12 20:40 ` [PATCH 08/31] Hob: Adjust the progress bar and set 100% only when all is done Scott Garman
2012-06-12 20:40 ` [PATCH 09/31] documentation/bsp-guide/bsp.xml: BSP recommendations section added Scott Garman
2012-06-12 20:41 ` [PATCH 10/31] documentation/bsp-guide/bsp.xml: Updates to requirements section Scott Garman
2012-06-12 20:41 ` [PATCH 11/31] rpm 5.4.0: respect to the arch when choose the alternatives Scott Garman
2012-06-12 20:41 ` [PATCH 12/31] ncurses: Avoid occasional builling failure when having parallel processable task Scott Garman
2012-06-12 20:41 ` [PATCH 13/31] bitbake.conf: Improve wget timeouts Scott Garman
2012-06-12 20:41 ` [PATCH 14/31] sudo: fixed wrong `chmod` path Scott Garman
2012-06-12 20:41 ` [PATCH 15/31] cooker.py: terminate the Parser processes Scott Garman
2012-06-12 20:41 ` [PATCH 16/31] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation Scott Garman
2012-06-12 20:41 ` [PATCH 17/31] sanity.bbclass: copy the data store and finalise before running checks Scott Garman
2012-06-12 20:41 ` [PATCH 18/31] classes/sanity: send sanity check failure as a separate event for Hob Scott Garman
2012-06-12 20:41 ` [PATCH 19/31] hob: handle sanity check failures as a separate event Scott Garman
2012-06-12 20:41 ` [PATCH 20/31] webkit-gtk: Use glib as unicode backend to avoid browser crash Scott Garman
2012-06-12 20:41 ` [PATCH 21/31] gnupg: add libusb to DEPENDS Scott Garman
2012-06-12 20:41 ` [PATCH 22/31] gnupg: disable CCID driver Scott Garman
2012-06-12 20:41 ` [PATCH 23/31] runqemu-ifup: enable arp proxying Scott Garman
2012-06-12 20:41 ` [PATCH 24/31] beecrypt: disable java Scott Garman
2012-06-12 20:41 ` [PATCH 25/31] groff: Fix build on Fedora 17 Scott Garman
2012-06-12 20:41 ` [PATCH 26/31] shared-mime-info: fix build race condition Scott Garman
2012-06-12 20:41 ` [PATCH 27/31] gitignore: add wildcard to match toplevel patch files Scott Garman
2012-06-12 20:41 ` [PATCH 28/31] freetype: upgrade to 2.4.9 Scott Garman
2012-06-12 20:41 ` [PATCH 29/31] poky.conf: use correct version string for Ubuntu 12.04 Scott Garman
2012-06-12 20:41 ` [PATCH 30/31] documentation/bsp-guide/bsp.xml: Review comments to recommendations Scott Garman
2012-06-12 20:41 ` [PATCH 31/31] documentation/poky.ent: Updated variables for correct 1.2.1 build Scott Garman
2012-06-13 16:10 ` RFC: [PATCH 00/31] denzil pull request Scott Garman
2012-06-14 10:32 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.