From e79805f038a40b5b9dca19e138639cc2b9a43537 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 19 Apr 2013 15:02:49 +0200 Subject: [PATCH] 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 --- .../recipes-core/base-files/base-files_3.0.14.bbappend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend index e3ac15547..0abc5b814 100644 --- a/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend @@ -8,7 +8,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://os-release" 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()}" def del_tag(d): @@ -23,5 +23,7 @@ do_install_append() { 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,##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 }