From c90c0ceca50fee19e683c19468110fba51da6cfe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Nov 2010 09:20:46 +0000 Subject: base-files: Allow a basic issue file to be extended by the code, following the method now used by OE Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/issue | 2 -- meta/recipes-core/base-files/base-files/issue.net | 3 --- meta/recipes-core/base-files/base-files_3.0.14.bb | 8 +++----- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'meta/recipes-core/base-files') diff --git a/meta/recipes-core/base-files/base-files/issue b/meta/recipes-core/base-files/base-files/issue index 329af4665..e69de29bb 100644 --- a/meta/recipes-core/base-files/base-files/issue +++ b/meta/recipes-core/base-files/base-files/issue @@ -1,2 +0,0 @@ -OpenEmbedded Linux \n \l - diff --git a/meta/recipes-core/base-files/base-files/issue.net b/meta/recipes-core/base-files/base-files/issue.net index 6dc3588b4..e69de29bb 100644 --- a/meta/recipes-core/base-files/base-files/issue.net +++ b/meta/recipes-core/base-files/base-files/issue.net @@ -1,3 +0,0 @@ -OpenEmbedded Linux %h - - 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 aad3d8352..56a48fb3d 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 @@ -116,9 +116,10 @@ do_install_basefilesissue () { echo ${hostname} > ${D}${sysconfdir}/hostname fi + install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} if [ -n "${DISTRO_NAME}" ]; then - echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue - echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net + echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue + echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net if [ -n "${DISTRO_VERSION}" ]; then echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net @@ -127,9 +128,6 @@ do_install_basefilesissue () { echo >> ${D}${sysconfdir}/issue echo "%h" >> ${D}${sysconfdir}/issue.net echo >> ${D}${sysconfdir}/issue.net - else - install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue - install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net fi } -- cgit v1.2.3