From f02cd18a94fcb78f436da6562670b52ff57fa670 Mon Sep 17 00:00:00 2001 From: eportnov Date: Mon, 25 Jul 2022 17:06:52 +0300 Subject: revert telemetry --- .../telemetry/0001-set_new_report_path.patch | 22 ---------------------- .../telemetry/telemetry/3017361602 | 1 - .../telemetry/telemetry_%.bbappend | 8 -------- 3 files changed, 31 deletions(-) delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0001-set_new_report_path.patch delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/3017361602 delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0001-set_new_report_path.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0001-set_new_report_path.patch deleted file mode 100644 index b59438bd28..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0001-set_new_report_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 71ad04dd8ce0a31fe260626215d30bf0e58b255c Mon Sep 17 00:00:00 2001 -From: eportnov -Date: Fri, 15 Jul 2022 17:38:30 +0300 -Subject: [PATCH] set_new_report_path - ---- - src/report.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/report.hpp b/src/report.hpp -index 6d8c6b4..8d71bc9 100644 ---- a/src/report.hpp -+++ b/src/report.hpp -@@ -137,7 +137,7 @@ class Report : public interfaces::Report, public interfaces::MetricListener - static constexpr const char* reportIfaceName = - "xyz.openbmc_project.Telemetry.Report"; - static constexpr const char* reportDir = -- "/xyz/openbmc_project/Telemetry/Reports/"; -+ "/xyz/openbmc_project/Telemetry/Reports/TelemetryService/"; - static constexpr const char* deleteIfaceName = - "xyz.openbmc_project.Object.Delete"; - static constexpr size_t reportVersion = 6; diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/3017361602 b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/3017361602 deleted file mode 100644 index 57252a3388..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/3017361602 +++ /dev/null @@ -1 +0,0 @@ -{"AppendLimit":20,"Enabled":true,"Id":"report_id","Interval":1000,"Name":"report_name","ReadingParameters":[{"collectionDuration":10,"collectionTimeScope":0,"id":"id","operationType":2,"sensorPath":[{"metadata":"meta_data","path":"/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU1","service":"xyz.openbmc_project.ADCSensor"}]}],"ReportActions":[1],"ReportUpdates":2,"ReportingType":0,"Version":6} \ No newline at end of file diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend deleted file mode 100644 index ca45488936..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -SRC_URI += "file://3017361602 \ - file://0001-set_new_report_path.patch \ - " -do_install:append() { - install -d ${D}/var/lib/telemetry/Reports - cp ${WORKDIR}/3017361602 ${D}/var/lib/telemetry/Reports -} -- cgit v1.2.3