obmc-console: Convert configs from socket-id to console-id
As of 9a8f30ec5b58 ("obmc-console: Introduce console-id, deprecate
socket-id") in obmc-console `console-id` is preferred over `socket-id`.
Convert all in-tree configurations to `console-id` to enable removal of
support for the deprecated `socket-id` configuration option.
Change-Id: Ifd50603c378cfed5eb793b829b8296b7964e4194
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf
index 901895b..ec15f2c 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf
@@ -1 +1 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf
index f06d9fc..36969ed 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf
@@ -1 +1 @@
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf
index dba9b8d..c030716 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf
@@ -1 +1 @@
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf
index 0047b89..52f65ca 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf
@@ -1 +1 @@
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf
index 2d80850..4cb90a7 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf
@@ -1,3 +1,3 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
local-tty = ttyS0
local-tty-baud = 115200
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf
index 6421f93..4b0d093 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf
@@ -1,3 +1,3 @@
local-tty = ttyS1
local-tty-baud = 115200
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf
index f8be872..faf3906 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf
@@ -1,3 +1,3 @@
local-tty = ttyS2
local-tty-baud = 115200
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index 8f1ebba..9cda930 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,3 +1,3 @@
local-tty = ttyS3
local-tty-baud = 115200
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
index 901895b..ec15f2c 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
@@ -1 +1 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
index f06d9fc..36969ed 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
@@ -1 +1 @@
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
index dba9b8d..c030716 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
@@ -1 +1 @@
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
index 0047b89..52f65ca 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
@@ -1 +1 @@
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
index 2b99388..4753bde 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
@@ -1 +1 @@
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
index 407f84c..295dd14 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
@@ -1 +1 @@
-socket-id = ttyS8
+console-id = ttyS8
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
index 2d80850..4cb90a7 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
@@ -1,3 +1,3 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
local-tty = ttyS0
local-tty-baud = 115200
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
index 6421f93..4b0d093 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
@@ -1,3 +1,3 @@
local-tty = ttyS1
local-tty-baud = 115200
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
index f8be872..faf3906 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
@@ -1,3 +1,3 @@
local-tty = ttyS2
local-tty-baud = 115200
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index 8f1ebba..9cda930 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,3 +1,3 @@
local-tty = ttyS3
local-tty-baud = 115200
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
index decc72f..11595e5 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
@@ -1,3 +1,3 @@
local-tty = ttyS7
local-tty-baud = 115200
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
index df56992..ec2f9f3 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
@@ -1,3 +1,3 @@
local-tty = ttyS8
local-tty-baud = 115200
-socket-id = ttyS8
+console-id = ttyS8
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
index 88aa57c..9af5732 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
@@ -1 +1 @@
-socket-id = host0
+console-id = host0
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
index 22273d4..23e856f 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
@@ -1 +1 @@
-socket-id = host1
+console-id = host1
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
index 0eeb5b7..4a1d19f 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
@@ -1 +1 @@
-socket-id = host2
+console-id = host2
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
index be8e82e..9976752 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
@@ -1 +1 @@
-socket-id = host3
+console-id = host3
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
index 6379c6e..90b842a 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
@@ -1,4 +1,4 @@
local-tty = ttyS0
baud = 57600
-socket-id = host0
+console-id = host0
logfile = /var/log/obmc-console0.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
index c678990..b8837fc 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
@@ -1,4 +1,4 @@
local-tty = ttyS1
baud = 57600
-socket-id = host1
+console-id = host1
logfile = /var/log/obmc-console1.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
index 91e7bd5..37f1ada 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
@@ -1,4 +1,4 @@
local-tty = ttyS2
baud = 57600
-socket-id = host2
+console-id = host2
logfile = /var/log/obmc-console2.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
index 991eaca..86de160 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
@@ -1,4 +1,4 @@
local-tty = ttyS3
baud = 57600
-socket-id = host3
+console-id = host3
logfile = /var/log/obmc-console3.log
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index 152c705..f2b65ec 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,4 +1,4 @@
baud = 115200
-socket-id = ttyS3
+console-id = ttyS3
logfile = /var/log/obmc-console-scp.log
logsize = 1M
diff --git a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index ae469bb..c11880f 100644
--- a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,4 +1,4 @@
baud = 115200
-socket-id = ttyS3
+console-id = ttyS3
logfile = /var/log/obmc-console-mpro.log
logsize = 1M
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
index 7a44591..75883d0 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
@@ -1 +1 @@
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
index 8b3e8ca..66a0d1e 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
@@ -1,5 +1,5 @@
lpc-address = 0x2f8
sirq = 3
-socket-id = hypervisor
+console-id = hypervisor
logsize = 256k
logfile = /var/log/obmc-console1.log
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
index 7a44591..75883d0 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
@@ -1 +1 @@
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
index 0bc52cc..1ec7587 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
@@ -1,3 +1,3 @@
lpc-address = 0x2f8
sirq = 3
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
index b318c88..dbcb6ab 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
@@ -6,20 +6,20 @@
install_concurrent_console_config() {
# Install configuration for the servers and clients. Keep commandline
# compatibility with previous configurations by defaulting to not
- # specifying a socket-id for VUART0/2200
+ # specifying a console-id for VUART0/2200
install -m 0755 -d ${D}${sysconfdir}/${BPN}
# Remove the default client configuration as we don't to define a
- # socket-id for the 2200 console
+ # console-id for the 2200 console
rm -f ${D}${sysconfdir}/${BPN}/client.2200.conf
# However, now link to /dev/null as a way of not specifying a
- # socket-id while having a configuration file present. We need to
+ # console-id while having a configuration file present. We need to
# provide a configuration path to meet the requirements of the packaged
# unit file.
ln -sr ${D}/dev/null ${D}${sysconfdir}/${BPN}/client.2200.conf
- # We need to populate socket-id for remaining consoles
+ # We need to populate console-id for remaining consoles
install -m 0644 ${WORKDIR}/client.2201.conf ${D}${sysconfdir}/${BPN}/
# Install configuration for remaining servers - the base recipe
diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
index 7f1d7f9..2d33233 100644
--- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
@@ -64,9 +64,9 @@
# Link the custom configuration to the required location
ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf
else
- # Otherwise, remove socket-id from the shipped configuration to
+ # Otherwise, remove console-id from the shipped configuration to
# align with the lack of a client configuration file
- sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf
+ sed -ri '/^console-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf
fi
fi
}