]> code.ossystems Code Review - openembedded-core.git/commitdiff
base-files: do not write the current date into /etc/issue and /etc/issue.net
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Fri, 10 Mar 2017 11:24:22 +0000 (13:24 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 11 Mar 2017 16:08:50 +0000 (16:08 +0000)
This is causing a problem in multilib where base-files and lib64/32-base-files
clash because they may have different dates. Also, if the package is coming
from sstate it has an incorrect date anyway.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/base-files/base-files_3.0.14.bb

index d13800531155c2334e1365249ce7c41ca66f9372..2f1786b784ced85098f6074d4659af7632cf215a 100644 (file)
@@ -145,8 +145,9 @@ do_install_basefilesissue () {
                printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
                printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
                if [ -n "${DISTRO_VERSION}" ]; then
-                       printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
-                       printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
+                       distro_version_nodate=${@'${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
                printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue
                echo >> ${D}${sysconfdir}/issue
@@ -154,6 +155,7 @@ do_install_basefilesissue () {
                echo >> ${D}${sysconfdir}/issue.net
        fi
 }
+do_install_basefilesissue[vardepsexclude] += "DATE"
 
 do_install_append_linuxstdbase() {
        for d in ${dirs755-lsb}; do