[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5051/8267] base-files: do not write the current date into /etc/issue and /etc/issue.net



commit cd06d245259ef0afd6558ebf55201a02db27019a
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Fri Mar 10 13:24:22 2017 +0200

    base-files: do not write the current date into /etc/issue and /etc/issue.net
    
    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.
    
    (From OE-Core rev: 846c86ffc4574feafd89a028e50f7719075633f2)
    
    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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
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 d138005..2f1786b 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
@@ -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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]