diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
commit | 794d26fa53ad7e8cb54a3a5773436b1d8e813f35 (patch) | |
tree | 92940f7842138b00efea3b42140093a3bf39b81b /meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend | |
parent | 235618c7396902842906bc3a8c90a3320aeeaeba (diff) | |
parent | a6da583e088a2e9462d5330555a704402eff74a9 (diff) | |
download | openbmc-794d26fa53ad7e8cb54a3a5773436b1d8e813f35.tar.xz |
Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend')
-rw-r--r-- | meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 24b52d731..ab61422cb 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,2 +1,16 @@ -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" + +SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" +EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers" + +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 +} |