zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

angstrom-version.bb: fix LexToken(TOKEN, 'nobranch', 0, 0) error

Browse Source 
Strip braces from git revision string e.g. from (no branch)
to not confuse the tokenizing. Without the following error
occures on a detached (no branch) git branch :

  File "sources/bitbake/lib/bb/pysh/pyshyacc.py", line 646, in p_error(p=LexToken(TOKEN,'nobranch',0,0)):
             w('  %r\n' % n)
    >    raise sherrors.ShellSyntaxError(''.join(msg))

ShellSyntaxError: LexToken(TOKEN,'nobranch',0,0)
followed by:
  LexToken(RPARENS,')',0,0)
  LexToken(TOKEN,':5260401eb0cfe37a7358296866b4b43a167817ff"\nmeta              = "',0,0)
  LexToken(LPARENS,'(',0,0)
  LexToken(TOKEN,'nobranch',0,0)
  LexToken(RPARENS,')',0,0)

Signed-off-by: Bernhard Guillon <Bernhard.Guillon@hale.at>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Bernhard Guillon
2011-11-14 11:35:52 +01:00
committed by Koen Kooi
parent e003be8cba
commit f9679a34fc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-angstrom/angstrom/angstrom-version.bb
View File

@@ -2,7 +2,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PV = "${DISTRO_VERSION}"
PR = "r10"
PR = "r11"
PE = "2"
SRC_URI = "file://lsb_release"
@@ -13,7 +13,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
def get_layers(bb, d):
layers = (bb.data.getVar("BBLAYERS", d, 1) or "").split()
layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \
base_get_metadata_git_branch(i, None).strip(), \
base_get_metadata_git_branch(i, None).strip().strip('()'), \
base_get_metadata_git_revision(i, None)) \
for i in layers]
i = len(layers_branch_rev)-1