Skip to contentSkip to conversation

Replace deprecated SERIAL_CONSOLE with SERIAL_CONSOLES.

PATCH In review Robert P. J. Day 2 participants 2 messages Feb 24, 2015 – Feb 27, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Replace deprecated SERIAL_CONSOLE with SERIAL_CONSOLES.

---

there are still a few remaining references to SERIAL_CONSOLE, but
i'll leave it to someone else to decide when to remove that entirely. i'm assuming this is a fairly obvious textual replacement.

meta/conf/machine/include/x86-base.inc +1 -1
index f7c8a45..520211b 100644
@@ -14,7 +14,7 @@ IMAGE_FSTYPES += "live"
 
 KERNEL_IMAGETYPE ?= "bzImage"
 
-SERIAL_CONSOLE ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 
 #
 # kernel-related variables
meta/conf/machine/qemuarm.conf +1 -1
index d07084b..3e05bfa 100644
@@ -8,5 +8,5 @@ require conf/machine/include/tune-arm926ejs.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
-SERIAL_CONSOLE = "115200 ttyAMA0"
+SERIAL_CONSOLES = "115200;ttyAMA0"
 
meta/conf/machine/qemuarm64.conf +1 -1
index 20bcfba..90047d3 100644
@@ -9,4 +9,4 @@ MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
 
-SERIAL_CONSOLE = "38400 ttyAMA0"
+SERIAL_CONSOLES = "38400;ttyAMA0"
meta/conf/machine/qemumips.conf +1 -1
index d9d2421..b84fc84 100644
@@ -8,6 +8,6 @@ require conf/machine/include/tune-mips32r2.inc
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
meta/conf/machine/qemumips64.conf +1 -1
index b2c7998..8e911ae 100644
@@ -8,6 +8,6 @@ require conf/machine/include/tune-mips64.inc
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
meta/conf/machine/qemuppc.conf +1 -1
index 93145a1..6ab9cc3 100644
@@ -7,5 +7,5 @@ require conf/machine/include/tune-ppc7400.inc
 
 KERNEL_IMAGETYPE = "vmlinux"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
meta/conf/machine/qemux86-64.conf +1 -1
index 837f9f4..a04375d 100644
@@ -13,7 +13,7 @@ require conf/machine/include/tune-core2.inc
 
 KERNEL_IMAGETYPE = "bzImage"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
 XSERVER = "xserver-xorg \
            ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
meta/conf/machine/qemux86.conf +1 -1
index 3562276..e7adc42 100644
@@ -12,7 +12,7 @@ require conf/machine/include/tune-i586.inc
 
 KERNEL_IMAGETYPE = "bzImage"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
 XSERVER = "xserver-xorg \
            ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
meta/recipes-core/systemd/systemd-serialgetty.bb +1 -1
index 1c34d5c..2095d89 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 
 PR = "r5"
 
-SERIAL_CONSOLE ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 
 SRC_URI = "file://[email protected]"
 
Signature · 7 lines
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================
#1 lore raw
Quoted 14 lines · Robert P. J. Day

---

there are still a few remaining references to SERIAL_CONSOLE, but
i'll leave it to someone else to decide when to remove that entirely. i'm assuming this is a fairly obvious textual replacement.

meta/conf/machine/qemuarm.conf +0 -0
index d07084b..3e05bfa 100644

meta/conf/machine/qemuarm.conf require conf/machine/include/tune-arm926ejs.inc · line 12

Quoted 6 lines
meta/conf/machine/qemuarm.conf +1 -1
@@ -8,5 +8,5 @@ require conf/machine/include/tune-arm926ejs.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
-SERIAL_CONSOLE = "115200 ttyAMA0"
+SERIAL_CONSOLES = "115200;ttyAMA0"
 

When SERIAL_CONSOLES is set by bitbake.conf the assignment is with "??=", so this change will break things unexpectedly for anyone who may rely on over-riding SERIAL_CONSOLES from a local.conf file, etc.

Perhaps better to make these new SERIAL_CONSOLES assignments with "?=" instead of "=" ?