summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2020-04-03 08:50:51 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-04-14 22:26:05 +0300
commit274f96aa19d8a5b241c4676f223d4398e5fb3918 (patch)
tree09b932368a79e719fd174ea571ebb91357689501 /meta-ibm/meta-witherspoon
parentc5afed49dff50f350a4a37bdba19852aeb1842af (diff)
downloadopenbmc-274f96aa19d8a5b241c4676f223d4398e5fb3918.tar.xz
meta-witherspoon: Migrate console configuration to new layout
The obmc-console has rearranged its configuration file layout to cater to concurrent console server instances. Make use of the new layout. (From meta-ibm rev: 43fb498820e2b21282197833ed52124792a472e5) Change-Id: I124fd5cf37047651bc1f046039ad4b776eb2ff62 Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon')
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf)0
-rwxr-xr-xmeta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf)0
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend3
3 files changed, 3 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf
index 638ae7e5d9..638ae7e5d9 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf
index a5ba3f3284..a5ba3f3284 100755
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
index 72d991c7e5..b121be7af2 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_remove = "file://${BPN}.conf"
+SRC_URI += "file://server.ttyVUART0.conf"