summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2016-08-03 19:36:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:32 +0100
commitda72327ab03cbbb72ce999a167e7e3b4b4aa736a (patch)
tree872e3a4bd2cf3b05efbdc294b3da52d1f9947e46 /meta
parent95403e3ecd6dde3816c6ec19643075106d6562d0 (diff)
downloadpoky-da72327ab03cbbb72ce999a167e7e3b4b4aa736a.tar.gz
sysvinit-inittab_2.88dsf.bb: Allow aliasing with SERIAL_CONSOLES_CHECK
With some hardware the name of the device node and the name in /proc/console differ. This causes SERIAL_CONSOLES_CHECK to not enable working consoles in these cases. This patch changes SERIAL_CONSOLES_CHECK to have an optional alias for the checked consoles. The new format is: <device>:<alias to check(optional)> Fixes [YOCTO #9440]. (From OE-Core rev: 91d9f3271c12fb755ab332637b17650d5fe75ce2) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index bdc3416aa9..f136ad821b 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -58,9 +58,12 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
58 tmp="${SERIAL_CONSOLES_CHECK}" 58 tmp="${SERIAL_CONSOLES_CHECK}"
59 for i in $tmp 59 for i in $tmp
60 do 60 do
61 j=`echo ${i} | sed s/^.*\;//g` 61 j=`echo ${i} | sed -e s/^.*\;//g -e s/\:.*//g`
62 k=`echo ${i} | sed s/^.*\://g`
62 if [ -z "`grep ${j} /proc/consoles`" ]; then 63 if [ -z "`grep ${j} /proc/consoles`" ]; then
63 sed -i /^.*${j}$/d /etc/inittab 64 if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
65 sed -i /^.*${j}$/d /etc/inittab
66 fi
64 fi 67 fi
65 done 68 done
66 kill -HUP 1 69 kill -HUP 1