diff options
36 files changed, 40 insertions, 40 deletions
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 901895bedb..ec15f2c99c 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 f06d9fccd6..36969eda7a 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 dba9b8d836..c03071662e 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 0047b898fa..52f65caf45 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 2d80850416..4cb90a73c6 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 6421f93397..4b0d09356f 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 f8be872f25..faf3906553 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 8f1ebbac73..9cda930549 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 901895bedb..ec15f2c99c 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 f06d9fccd6..36969eda7a 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 dba9b8d836..c03071662e 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 0047b898fa..52f65caf45 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 2b99388ffb..4753bde09a 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 407f84cb9f..295dd14d2e 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 2d80850416..4cb90a73c6 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 6421f93397..4b0d09356f 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 f8be872f25..faf3906553 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 8f1ebbac73..9cda930549 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 decc72f293..11595e5b14 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 df56992ad9..ec2f9f32a0 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 88aa57cff3..9af57323ec 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 22273d4f3b..23e856fa7a 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 0eeb5b785a..4a1d19f34c 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 be8e82e237..9976752188 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 6379c6ea2f..90b842a6ab 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 c6789900c6..b8837fc5ca 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 91e7bd59c4..37f1adafe4 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 991eacabae..86de160dd8 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 152c705331..f2b65ec2f1 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 ae469bbb27..c11880fab5 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 7a4459123f..75883d04cf 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 8b3e8caee5..66a0d1e102 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 7a4459123f..75883d04cf 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 0bc52cc857..1ec758773c 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 b318c88dac..dbcb6ab640 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -6,20 +6,20 @@ SRC_URI += "file://server.ttyVUART0.conf" 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 7f1d7f9ef6..2d332336c0 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 @@ do_install:append() { # 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 } |