| commit | c9235698b948e6dd1209b34013436a14bd2b4dab | [log] [tgz] |
|---|---|---|
| author | Adriana Kobylak <anoo@us.ibm.com> | Thu Mar 25 16:36:59 2021 +0000 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Apr 01 12:10:06 2021 +0000 |
| tree | 61bb9777efa5adf79bc11871a00c366975a8ffa3 | |
| parent | d92b5ed20b9213691e7e18c7c7c37dfb9d705337 [diff] |
ibm: obmc-console: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Tested: Built rainier and verified the console files were installed: rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/obmc-console/ Change-Id: Ida1010ae6c6c0e1eecf2b62521c06bfe055b0d88 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf similarity index 100% rename from meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf rename to meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf similarity index 100% rename from meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf rename to meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf similarity index 100% rename from meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf rename to meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index c10b7ce..a35e6d4 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
@@ -27,21 +27,21 @@ install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/ } -SRC_URI_append_rainier = " file://client.2201.conf" -SRC_URI_append_rainier = " file://server.ttyVUART1.conf" +SRC_URI_append_p10bmc = " file://client.2201.conf" +SRC_URI_append_p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}_append_rainier = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES_${PN}_append_p10bmc = " obmc_console_guests:tcp:2201:" -SYSTEMD_SERVICE_${PN}_append_rainier = " obmc-console-ssh@2200.service \ +SYSTEMD_SERVICE_${PN}_append_p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ " -SYSTEMD_SERVICE_${PN}_remove_rainier = "obmc-console-ssh.socket" +SYSTEMD_SERVICE_${PN}_remove_p10bmc = "obmc-console-ssh.socket" -FILES_${PN}_remove_rainier = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" +FILES_${PN}_remove_p10bmc = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF_append_rainier = " --enable-concurrent-servers" +EXTRA_OECONF_append_p10bmc = " --enable-concurrent-servers" -do_install_append_rainier() { +do_install_append_p10bmc() { install_concurrent_console_config }