Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: use SERIAL_CONSOLES instead of SERIAL_CONSOLE 

SERIAL_CONSOLE variable has been deprecated in poky. The new
SERIAL_CONSOLES allows to configure multiple devices.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-01-14 17:19:38 +01:00
parent d3726ffff7
commit 55ead71345
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/ccardimx28js.conf
View File

@ -10,7 +10,7 @@ KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb"
# Use standard serial port name and let device handlers (mdev, udev)
# create a symlink to the correct device.
SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLES = "115200;ttyS0"
# Use our wmiconfig instead of the one in meta-oe
PREFERRED_VERSION_wmiconfig ?= "3.4p4"

2
meta-digi-arm/conf/machine/ccimx51js.conf
View File

@ -4,7 +4,7 @@
include conf/machine/include/ccimx51.inc
SERIAL_CONSOLE = "38400 ttymxc1"
SERIAL_CONSOLES = "38400;ttymxc1"
#################################################
## Flash parameters for JFFS2 and UBIFS images ##

2
meta-digi-arm/conf/machine/ccimx53js.conf
View File

@ -5,7 +5,7 @@
# Contains the ConnectCore for MX53 module.
include conf/machine/include/ccimx53.inc
SERIAL_CONSOLE = "115200 ttymxc0"
SERIAL_CONSOLES = "115200;ttymxc0"
#################################################
## Flash parameters for JFFS2 and UBIFS images ##

21
meta-digi-dey/classes/dey-image.bbclass
View File

@ -68,12 +68,25 @@ dey_rootfs_tuning() {
exec /bin/login -f root
_EOF_
chmod u+x ${IMAGE_ROOTFS}/sbin/rootlogin
sed -i -e '
/^S.*getty/{
# The 'echo' trick is needed because the SERIAL_CONSOLES variable
# is expanded by bitbake and contains a semicolon ';'
for i in $(echo "${SERIAL_CONSOLES}"); do
label="$(echo $i | sed -e 's,.*tty\(.*\),\1,g')"
sed -i -e "
/^$label:.*getty/{
i\## WARNING: passwordless 'root' autologin enabled
a\~~::sysinit:/usr/sbin/telnetd -l /sbin/rootlogin
s,getty,getty -n -l /sbin/rootlogin,g
}' ${IMAGE_ROOTFS}/etc/inittab
}" ${IMAGE_ROOTFS}/etc/inittab
done
# Install a telnetd daemon if there isn't one
if ! grep -qs telnetd ${IMAGE_ROOTFS}/etc/inittab; then
cat >>${IMAGE_ROOTFS}/etc/inittab <<-_EOF_
## WARNING: passwordless 'root' telnet daemon
~~::sysinit:/usr/sbin/telnetd -l /sbin/rootlogin
_EOF_
fi
rm -f ${IMAGE_ROOTFS}/etc/securetty
fi
fi