diff options
author | Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | 2018-08-08 22:27:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:31 +0100 |
commit | 23a9cdba166e0d61271dc7eddfcc35ca503e34a4 (patch) | |
tree | 02b18238144d4e5b4ece6a09848ff3c11ad703d7 /meta | |
parent | c870856a2d625369d6acefc27676ab7b8b69282e (diff) | |
download | poky-23a9cdba166e0d61271dc7eddfcc35ca503e34a4.tar.gz |
meta: replace deprecated "SERIAL_CONSOLE"
SERIAL_CONSOLE was already deprecated in 2013, yet still some
machine configuration files were using it. This patch replaces
it with SERIAL_CONSOLES, which is the successor.
The default value in systemd-serialgetty.bb can also be safely
transitioned from SERIAL_CONSOLE to SERIAL_CONSOLES, as this
recipe already uses SERIAL_CONSOLES within do_install().
The documentation seems to be already up do date.
beaglebone-yocto.conf in the bsp-guide already uses
SERIAL_CONSOLES. The ref-manual redirects from SERIAL_CONSOLE
to SERIAL_CONSOLES.
[YOCTO #12653]
(From OE-Core rev: e5bde3d466869df9fce559e49842ac245153d045)
Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index be037beb29..06de778b5b 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
@@ -12,7 +12,7 @@ IMAGE_FSTYPES ?= "hddimg" | |||
12 | 12 | ||
13 | KERNEL_IMAGETYPE ?= "bzImage" | 13 | KERNEL_IMAGETYPE ?= "bzImage" |
14 | 14 | ||
15 | SERIAL_CONSOLE ?= "115200 ttyS0" | 15 | SERIAL_CONSOLES ?= "115200;ttyS0" |
16 | 16 | ||
17 | # | 17 | # |
18 | # kernel-related variables | 18 | # kernel-related variables |
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index d67a3c91b4..65a931f418 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 | |||
5 | 5 | ||
6 | PR = "r5" | 6 | PR = "r5" |
7 | 7 | ||
8 | SERIAL_CONSOLE ?= "115200 ttyS0" | 8 | SERIAL_CONSOLES ?= "115200;ttyS0" |
9 | 9 | ||
10 | SRC_URI = "file://serial-getty@.service" | 10 | SRC_URI = "file://serial-getty@.service" |
11 | 11 | ||