summaryrefslogtreecommitdiff
path: root/meta-facebook
diff options
context:
space:
mode:
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
+}