[oe-commits] [openembedded-core] 03/03: base-files: Avoid problems if DISTRO_VERSION contains undefined variable

git at git.openembedded.org git at git.openembedded.org
Fri Jan 18 17:59:41 UTC 2019

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6195f455a3bd518ea04100a26d3615ff0e829aae
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Fri Jan 18 16:41:50 2019 +0100

    base-files: Avoid problems if DISTRO_VERSION contains undefined variable
    If DISTRO_VERSION is defined to some undefined variable, e.g.,
    DISTRO_VERSION = "${FOO_VERSION}", and /bin/sh is dash, then
    do_install() would fail with an error such as:
      run.do_install.2945:193: run.do_install.2945: Syntax error:
      Unterminated quoted string
    This was due to unexpanded Python code making it into the shell code,
    confusing the shell parser.
    Reported-by: srinivasan <srinivasan.rns at gmail.com>
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
 meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6e30c14..f42a4ef 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -150,7 +150,7 @@ do_install_basefilesissue () {
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
 		if [ -n "${DISTRO_VERSION}" ]; then
-			distro_version_nodate=${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot').replace('${DATE}','')}
+			distro_version_nodate="${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}','snapshot').replace('${DATE}','')}"
 			printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue
 			printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue.net

To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Openembedded-commits mailing list