From a7393b43c0a599265db31f8adbf7ced72466a7b5 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Wed, 22 Jun 2022 16:51:58 +0300 Subject: WEBUI: AppLayout app-content overflow; LOGGING: remove ttyVUART0 --- .../phosphor-hostlogger/cp2-5422/ttyS2.conf | 7 ++++++ .../phosphor-hostlogger/cp2-5422/ttyVUART0.conf | 7 ------ .../logging/phosphor-hostlogger_%.bbappend | 5 ++--- .../0006-AppLayout-app-content-overflow.patch | 23 ++++++++++++++++++++ .../0006-AppLayout-refresh-UI-on-time.patch | 25 ---------------------- .../0007-AppLayout-refresh-UI-on-time.patch | 25 ++++++++++++++++++++++ .../recipes-phosphor/webui/webui-vue_%.bbappend | 3 ++- 7 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyVUART0.conf create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch create mode 100644 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/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf new file mode 100644 index 0000000000..c75186415a --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyS2.conf @@ -0,0 +1,7 @@ +SOCKET_ID= +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host0 +OUT_DIR=/var/lib/obmc/hostlogs +MAX_FILES=10 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/ttyVUART0.conf deleted file mode 100644 index c75186415a..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/logging/phosphor-hostlogger/cp2-5422/ttyVUART0.conf +++ /dev/null @@ -1,7 +0,0 @@ -SOCKET_ID= -BUF_MAXSIZE=3000 -BUF_MAXTIME=0 -FLUSH_FULL=false -HOST_STATE=/xyz/openbmc_project/state/host0 -OUT_DIR=/var/lib/obmc/hostlogs -MAX_FILES=10 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" +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; + } + +-- +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/0006-AppLayout-refresh-UI-on-time.patch deleted file mode 100644 index 8ae2342734..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dde98ca4147da6e3df0dee55a3161573993f00cb Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" -Date: Tue, 14 Jun 2022 08:09:34 +0300 -Subject: [PATCH] AppLayout: refresh UI on time - ---- - src/layouts/AppLayout.vue | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue -index 0b78e5b1..c0bfff26 100644 ---- a/src/layouts/AppLayout.vue -+++ b/src/layouts/AppLayout.vue -@@ -3,7 +3,7 @@ - - --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-AppLayout-refresh-UI-on-time.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-AppLayout-refresh-UI-on-time.patch new file mode 100644 index 0000000000..8ae2342734 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-AppLayout-refresh-UI-on-time.patch @@ -0,0 +1,25 @@ +From dde98ca4147da6e3df0dee55a3161573993f00cb Mon Sep 17 00:00:00 2001 +From: "Andrey V.Kosteltsev" +Date: Tue, 14 Jun 2022 08:09:34 +0300 +Subject: [PATCH] AppLayout: refresh UI on time + +--- + src/layouts/AppLayout.vue | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue +index 0b78e5b1..c0bfff26 100644 +--- a/src/layouts/AppLayout.vue ++++ b/src/layouts/AppLayout.vue +@@ -3,7 +3,7 @@ + + +-- +2.35.1 + 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 () { -- cgit v1.2.3