WEBUI: AppLayout app-content overflow; LOGGING: remove ttyVUART0

5 files changed, 27 insertions, 4 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyVUART0.conf b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf
index c75186415a..c75186415a 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyVUART0.conf
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
index a8366ea8d6..24087f4c0d 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
@@ -1,8 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-# Default service instance to install (single-host mode)
-DEFAULT_INSTANCE = "ttyVUART0"
+CUSTOM_CONFIGS = "ttyS2.conf"
 
 SRC_URI:remove = "file://${BPN}.conf"
-SRC_URI += "file://ttyVUART0.conf"
+SRC_URI += "file://ttyS2.conf"
 
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch
new file mode 100644
index 0000000000..f79b9ffd74
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch
@@ -0,0 +1,23 @@
+From ccfd9a235b40b0eee364a72458c0e9a82c8e51ce Mon Sep 17 00:00:00 2001
+From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
+Date: Wed, 22 Jun 2022 14:16:57 +0300
+Subject: [PATCH] AppLayout app-content overflow
+
+---
+ src/layouts/AppLayout.vue | 1 +
+ 1 file changed, 1 insertions(+), 0 deletion(-)
+
+diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
+index 0b78e5b1..43980111 100644
+--- a/src/layouts/AppLayout.vue
++++ b/src/layouts/AppLayout.vue
+@@ -87,5 +87,6 @@ export default {
+ .app-content {
+   grid-area: content;
+   background-color: $white;
++  overflow-x: auto;
+ }
+ </style>
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-AppLayout-refresh-UI-on-time.patch
index 8ae2342734..8ae2342734 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-AppLayout-refresh-UI-on-time.patch
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
index 428b55e6ea..728e09bf92 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
@@ -20,7 +20,8 @@ SRC_URI += "\
     file://0003-GlobalStore-Trim-assetTag-and-serialNumber.patch \
     file://0004-main-padding-right-when-media-gt-992px.patch \
     file://0005-ButtonBackToTop-alignment.patch \
-    file://0006-AppLayout-refresh-UI-on-time.patch \
+    file://0006-AppLayout-app-content-overflow.patch \
+    file://0007-AppLayout-refresh-UI-on-time.patch \
     "
 
 do_update_logo () {