From: Peter Kjellerstedt Date: Fri, 18 Jan 2019 15:41:50 +0000 (+0100) Subject: base-files: Avoid problems if DISTRO_VERSION contains undefined variable X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15595 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd0b9e26ef11fa287692848ea3add64ba623433;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- 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 6e30c149ba8..f42a4ef7c45 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 fi