Skip to contentSkip to conversation

Misc fixes

PATCH Applied Joshua Lock 2 participants 4 messages Feb 25, 2011

lore
Share & tools
lore
#0 lore raw

cover Misc fixes

From: Joshua Lock <[email protected]>

A couple of minor patches the first to fix a warning when parsing lexically incorrect recipes and the second removes a warning during the standard build.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/misc

Thanks,
Joshua Lock <[email protected]>
---

Joshua Lock (2):
bitbake/codeparser: fix raising of ShellSyntaxError
dropbear: add SRC_URI checksums

 bitbake/lib/bb/codeparser.py                |    4 ++--
 meta/recipes-core/dropbear/dropbear_0.52.bb |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4
#1 lore raw

PATCH 1/2 bitbake/codeparser: fix raising of ShellSyntaxError

From: Joshua Lock <[email protected]>

To raise the ShellSyntaxError we need to import it's module and reference it by namespace.

---
 bitbake/lib/bb/codeparser.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
bitbake/lib/bb/codeparser.py +2 -2
index bfffcac..c887a3c 100644
@@ -4,7 +4,7 @@ import logging
 import os.path
 import bb.utils, bb.data
 from itertools import chain
-from pysh import pyshyacc, pyshlex
+from pysh import pyshyacc, pyshlex, sherrors
 
 
 logger = logging.getLogger('BitBake.CodeParser')
@@ -227,7 +227,7 @@ class ShellParser():
         try:
             tokens, _ = pyshyacc.parse(value, eof=True, debug=False)
         except pyshlex.NeedMore:
-            raise ShellSyntaxError("Unexpected EOF")
+            raise sherrors.ShellSyntaxError("Unexpected EOF")
 
         for token in tokens:
             self.process_tokens(token)
Signature · 1 line
1.7.4
#2 lore raw

PATCH 2/2 dropbear: add SRC_URI checksums

In reply to Joshua Lock

From: Joshua Lock <[email protected]>

---
 meta/recipes-core/dropbear/dropbear_0.52.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-core/dropbear/dropbear_0.52.bb +3 -0
index 51217ea..6556bb4 100644
@@ -1,3 +1,6 @@
 require dropbear.inc
 
+SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
+SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
+
 PR="r0"
Signature · 1 line
1.7.4
#3 lore raw
In reply to Joshua Lock
Quoted 14 lines · Joshua Lock

From: Joshua Lock <[email protected]>

A couple of minor patches the first to fix a warning when parsing lexically incorrect recipes and the second removes a warning during the standard build.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/misc

Thanks,
Joshua Lock <[email protected]>
---

Quoted 7 lines

Joshua Lock (2):
bitbake/codeparser: fix raising of ShellSyntaxError
dropbear: add SRC_URI checksums

 bitbake/lib/bb/codeparser.py                |    4 ++--
 meta/recipes-core/dropbear/dropbear_0.52.bb |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Merged to master, thanks!

Richard