Consolidated pull
cover Consolidated pull
The following changes since commit 1f4bfa33073584c25396d74f3929f263f3df188b:
toasterconf.json: exclude releases Toaster can't build (2016-06-03 13:36:19 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/jethro-next
George McCollister (1):
wic: fix path parsing, use last occurrence
Nicolas Dechesne (1):
bluez5: move btmgmt to common READLINE section
meta/recipes-connectivity/bluez5/bluez5_5.33.bb | 2 +- scripts/lib/wic/plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.8.0
PATCH 1/2 bluez5: move btmgmt to common READLINE section
From: Nicolas Dechesne <[email protected]>
Upstream in 5.33 btmgmt was moved from experimental to common READLINE section, in commit e4f0c5582f1fe3451d5588243adba9de1ed68b80, but this was never updated in the recipe.
This is a backport from master branch, commit28777e593d3dd3a5d0ee2effcdca6a971e2887f9.
--- meta/recipes-connectivity/bluez5/bluez5_5.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bluez5/bluez5_5.33.bb +1 -1
@@ -10,6 +10,7 @@ NOINST_TOOLS_READLINE ?= " \ tools/obex-server-tool \ tools/bluetooth-player \ tools/obexctl \ + tools/btmgmt \ " # noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
@@ -34,7 +35,6 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/hwdb \ tools/hcieventmask \ tools/hcisecfilter \ - tools/btmgmt \ tools/btinfo \ tools/btattach \ tools/btsnoop \
Signature · 1 line
2.8.0
PATCH 2/2 wic: fix path parsing, use last occurrence
In reply to Robert YangFrom: George McCollister <[email protected]>
If the path contains 'scripts' more than once the first occurrence will be incorrectly used. Use rfind instead of find to find the last occurrence.
--- scripts/lib/wic/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugin.py +1 -1
@@ -42,7 +42,7 @@ class PluginMgr(object): def __init__(self): wic_path = os.path.dirname(__file__) - eos = wic_path.find('scripts') + len('scripts') + eos = wic_path.rfind('scripts') + len('scripts') scripts_path = wic_path[:eos] self.scripts_path = scripts_path self.plugin_dir = scripts_path + PLUGIN_DIR
Signature · 1 line
2.8.0