Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-files: fix bitbake parsing error 

An error appeared trying to setup a jenkins job to build yocto.

When using dettached repos for the different layers (as a result of
using 'repo' tool) bitbake somehow fails to parse 'base-files' recipe
because the branch of the layers is '(no branch)'.

The error message is:

ERROR: ExpansionError during parsing /data/jenkins/jobs/yocto_test/workspace/digi-yocto-sdk.jviguera_mkproject/sources/poky/meta/recipes-core/base-files/base-files_3.0.14.bb: Failure expanding variable do_install: ShellSyntaxError: LexToken(TOKEN,'nobranch',0,0)
followed by:
  LexToken(RPARENS,')',0,0)
  LexToken(TOKEN,':34e5537e67b655b8d2effbbecc207d88eea52b87"\nmeta-fsl-arm      = "',0,0)
  LexToken(LPARENS,'(',0,0)
  LexToken(TOKEN,'nobranch',0,0)
  LexToken(RPARENS,')',0,0)

This commit fixes the problem.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-04-19 15:02:49 +02:00
parent 13ae6f8bc9
commit e79805f038
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend
View File

@ -8,7 +8,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://os-release" SRC_URI += "file://os-release"
TIMESTAMP = "${@time.strftime('%Y%m%d%H%M')}" TIMESTAMP = "${@time.strftime('%Y%m%d%H%M')}"
LAYERS_REV = "${@"Layers revisions:\n%s\n" % '\n'.join(get_layers_branch_rev(d))}" LAYERS_REV = "${@"\nLayers revisions:\n%s\n" % '\n'.join(get_layers_branch_rev(d))}"
DEL_TAG = "${@del_tag(d).strip()}" DEL_TAG = "${@del_tag(d).strip()}"
def del_tag(d): def del_tag(d):
@ -23,5 +23,7 @@ do_install_append() {
install -m 0644 ${WORKDIR}/os-release ${D}${sysconfdir}/ install -m 0644 ${WORKDIR}/os-release ${D}${sysconfdir}/
sed -i -e 's,##DEL_TAG##,${DEL_TAG},g' ${D}${sysconfdir}/os-release sed -i -e 's,##DEL_TAG##,${DEL_TAG},g' ${D}${sysconfdir}/os-release
sed -i -e 's,##BUILD_TIMESTAMP##,${TIMESTAMP},g' ${D}${sysconfdir}/os-release sed -i -e 's,##BUILD_TIMESTAMP##,${TIMESTAMP},g' ${D}${sysconfdir}/os-release
printf "\n%s\n" "${LAYERS_REV}" >> ${D}${sysconfdir}/os-release cat >> ${D}${sysconfdir}/os-release <<-EOF
${LAYERS_REV}
EOF
} }