diff options
| author | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-10-07 08:55:14 +0300 |
|---|---|---|
| committer | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-10-07 08:55:14 +0300 |
| commit | f288fcb6d6801630adc5a0c9d911f664dfe21b0b (patch) | |
| tree | 109eba5a266a5523c142885185a9fa9ce3babd41 | |
| parent | ebf4700ee15f1eaad7f991d97e3e95d5a20e65f3 (diff) | |
| parent | 0c57f680bd20ef553b08fb84cb9a3a5fe12006da (diff) | |
| download | openbmc-f288fcb6d6801630adc5a0c9d911f664dfe21b0b.tar.xz | |
Merge branch 'sila-32MiB' of git.sila.ru:pub/openbmc/openbmc into sila-32MiB
4 files changed, 17 insertions, 16 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch index ea77f73844..34a1af1827 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch @@ -1,17 +1,17 @@ -From 20d0e08bebfb7d4f5001413ce512cf6a98ecef71 Mon Sep 17 00:00:00 2001 +From 0bf20ac0b410e2fb3d6bfd6b1c8b160eacc8623a Mon Sep 17 00:00:00 2001 From: claiff <claiff@mail.ru> -Date: Fri, 23 Sep 2022 16:18:09 +0300 -Subject: [PATCH] add smtp logging +Date: Thu, 6 Oct 2022 12:28:05 +0300 +Subject: [PATCH] add-smtp-logging --- - .../include/registries/openbmc_message_registry.hpp | 9 +++++++++ - 1 file changed, 9 insertions(+) + .../registries/openbmc_message_registry.hpp | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp -index 33058a80..7dea3fac 100644 +index 33058a80..04a88eed 100644 --- a/redfish-core/include/registries/openbmc_message_registry.hpp +++ b/redfish-core/include/registries/openbmc_message_registry.hpp -@@ -2170,6 +2170,15 @@ constexpr std::array registry = { +@@ -2170,6 +2170,24 @@ constexpr std::array registry = { {"string"}, "None.", }}, @@ -24,6 +24,15 @@ index 33058a80..7dea3fac 100644 + {"string", "string"}, + "None.", + }}, ++ MessageEntry{"SMTPOk", ++ { ++ "Event SMTP", ++ "SMTP manager: %1", ++ "OK", ++ 1, ++ {"string"}, ++ "None.", ++ }}, MessageEntry{"SparingRedundancyDegraded", { "Indicates the sparing redundancy state is degraded.", diff --git a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb index 87694809b0..3249d8bc49 100644 --- a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb +++ b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb @@ -8,18 +8,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://git@git.sila.ru/srv/pub/scm/git/openbmc/obmc-sila-smtp.git;branch=master;protocol=ssh" -SRCREV = "2b03fece7f5895591eabd2f04baa2df19b4c3417" +SRCREV = "04e97b30880c1c3252fe900ccac268267539e424" S = "${WORKDIR}/git" -SRC_URI += "file://settings.txt \ - file://mails.txt \ - " do_install:append() { install -d ${D}/var/lib/smtp/ - - install -m 0744 ${WORKDIR}/settings.txt ${D}/var/lib/smtp/ - install -m 0744 ${WORKDIR}/mails.txt ${D}/var/lib/smtp/ } inherit cmake systemd pkgconfig diff --git a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/mails.txt b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/mails.txt deleted file mode 100644 index 8d1c8b69c3..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/mails.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/settings.txt b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/settings.txt deleted file mode 100644 index 8d1c8b69c3..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp/settings.txt +++ /dev/null @@ -1 +0,0 @@ - |