From 1de5d0fed32fdc705e074c119630cbab10f0daf0 Mon Sep 17 00:00:00 2001 From: Vijay Khemka Date: Mon, 13 Apr 2020 13:51:18 -0700 Subject: meta-facebook: obmc-console: Fix SoL with new design With new design changes in obmc-console, config file needed changes to follow design. Also created separate directorey for machine to have machine specific config file. Tested: Verified this with tiogapass and see ttyS2 service is launching. (From meta-facebook rev: fc641dad18c84b391ce27da202a417f28d4da00b) Change-Id: I811e8241fd40fa503aa9861894602344c85eba5f Signed-off-by: Vijay Khemka Signed-off-by: Andrew Geissler --- .../recipes-phosphor/console/obmc-console/obmc-console.conf | 2 -- .../console/obmc-console/tiogapass/obmc-console.conf | 2 ++ .../recipes-phosphor/console/obmc-console_%.bbappend | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf (limited to 'meta-facebook/recipes-phosphor/console') diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index 94f1dff85..000000000 --- a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,2 +0,0 @@ -local-tty = ttyS2 -baud = 57600 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf new file mode 100644 index 000000000..94f1dff85 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf @@ -0,0 +1,2 @@ +local-tty = ttyS2 +baud = 57600 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 24b52d731..06a91ceb8 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,2 +1,13 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" + +SRC_URI += "file://*.conf" +SRC_URI_remove = "file://${BPN}.conf" + +do_install_append() { + # Install the server configuration + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + # Remove upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf +} -- cgit v1.2.3