base-files: move hostname operations out of issue file settings

The function do_install_basefilesissue is meant to deal with
/etc/issue* files and the following setting could actually be
overridden.

  BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"

So move the hostname operations out of this function.

(From OE-Core rev: f17bcc46341db5ee91bb26389ccaebc68c49b97e)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 a1639db830362b18939ece67578a9425becdec94..4b4027f18d7586afe01db8c05460d27904c5f938 100644 (file)
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -134,15 +134,16 @@ do_install () {
        install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
 
        ln -sf /proc/mounts ${D}${sysconfdir}/mtab
-}
 
-DISTRO_VERSION[vardepsexclude] += "DATE"
-do_install_basefilesissue () {
+       # deal with hostname
        if [ "${hostname}" ]; then
                echo ${hostname} > ${D}${sysconfdir}/hostname
                echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts
        fi
+}
 
+DISTRO_VERSION[vardepsexclude] += "DATE"
+do_install_basefilesissue () {
        install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
         if [ -n "${DISTRO_NAME}" ]; then
                printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue