summaryrefslogtreecommitdiff
path: root/meta-facebook
diff options
context:
space:
mode:
authorVijay Khemka <vijaykhemka@fb.com>2020-04-13 23:51:18 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-04-14 22:25:45 +0300
commit1de5d0fed32fdc705e074c119630cbab10f0daf0 (patch)
tree80fd6bb7a6d0a2387f1fe50d415ecf78ccb105c6 /meta-facebook
parent67b85fd6ea40a16ffd9bfe52b96024fc7dc35512 (diff)
downloadopenbmc-1de5d0fed32fdc705e074c119630cbab10f0daf0.tar.xz
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 <vijaykhemka@fb.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-facebook')
-rw-r--r--meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf (renamed from meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf)0
-rw-r--r--meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend13
2 files changed, 12 insertions, 1 deletions
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf
index 94f1dff853..94f1dff853 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
index 24b52d7319..06a91ceb8b 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
+}