summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-11-02 09:20:46 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-02 09:20:46 +0000
commitc90c0ceca50fee19e683c19468110fba51da6cfe (patch)
tree304bf254c88ed40bb7ac9cc87a521e42758e1cb6 /meta/recipes-core
parent904ccfe1c60eaba404a88cd03bbcb0a218f6b951 (diff)
downloadopenembedded-core-c90c0ceca50fee19e683c19468110fba51da6cfe.tar.gz
openembedded-core-c90c0ceca50fee19e683c19468110fba51da6cfe.tar.bz2
openembedded-core-c90c0ceca50fee19e683c19468110fba51da6cfe.zip
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 <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/base-files/base-files/issue2
-rw-r--r--meta/recipes-core/base-files/base-files/issue.net3
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb8
3 files changed, 3 insertions, 10 deletions
diff --git a/meta/recipes-core/base-files/base-files/issue b/meta/recipes-core/base-files/base-files/issue
index 329af4665e..e69de29bb2 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 6dc3588b4f..e69de29bb2 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 aad3d8352b..56a48fb3de 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
}