Explorar el Código

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>
Richard Purdie hace 14 años
padre
commit
c90c0ceca5

+ 0 - 2
meta/recipes-core/base-files/base-files/issue

@@ -1,2 +0,0 @@
-OpenEmbedded Linux \n \l
-

+ 0 - 3
meta/recipes-core/base-files/base-files/issue.net

@@ -1,3 +0,0 @@
-OpenEmbedded Linux %h
-
-

+ 3 - 5
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
 }