diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-10 13:24:22 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-11 16:09:14 +0000 |
| commit | cd06d245259ef0afd6558ebf55201a02db27019a (patch) | |
| tree | ea3b6d6cf92868f44db4a60e1ba30f31869e3f4a | |
| parent | b9c986b0f3bc3ddd583a670a502d7d4aec8959b6 (diff) | |
| download | poky-cd06d245259ef0afd6558ebf55201a02db27019a.tar.gz | |
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>
| -rw-r--r-- | 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 d138005311..2f1786b784 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 () { | |||
| 145 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue | 145 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue |
| 146 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net | 146 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net |
| 147 | if [ -n "${DISTRO_VERSION}" ]; then | 147 | if [ -n "${DISTRO_VERSION}" ]; then |
| 148 | printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue | 148 | distro_version_nodate=${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot').replace('${DATE}','')} |
| 149 | printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net | 149 | printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue |
| 150 | printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue.net | ||
| 150 | fi | 151 | fi |
| 151 | printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue | 152 | printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue |
| 152 | echo >> ${D}${sysconfdir}/issue | 153 | echo >> ${D}${sysconfdir}/issue |
| @@ -154,6 +155,7 @@ do_install_basefilesissue () { | |||
| 154 | echo >> ${D}${sysconfdir}/issue.net | 155 | echo >> ${D}${sysconfdir}/issue.net |
| 155 | fi | 156 | fi |
| 156 | } | 157 | } |
| 158 | do_install_basefilesissue[vardepsexclude] += "DATE" | ||
| 157 | 159 | ||
| 158 | do_install_append_linuxstdbase() { | 160 | do_install_append_linuxstdbase() { |
| 159 | for d in ${dirs755-lsb}; do | 161 | for d in ${dirs755-lsb}; do |
