From 439d11660261323cc453f9bc6774f8dc1334704d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 27 Apr 2021 06:51:15 +0000 Subject: phosphor-logging: srcrev bump 6b3f345b3f..a1c4338ece Lei YU (1): rsyslog-config: Support IPv6 address Patrick Williams (7): openpower-pels: src: remove use of VLA openpower-pels: clean up various compile warnings logging_test: fix compile warning from oe-sdk openpower-pels: repository: fix use-after-free rsyslog-config: fix memory leak in addressValid test: serialization_test_properties: fix stale stack use openpower-pels: json_utils: fix crash on invalid format string Change-Id: I6eeb14c0c34e389d32c25995aab3be9de2ccde10 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 5fa7f7a03..c6ba5c6d4 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -52,7 +52,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "6b3f345b3f265036ec339d097f9d60d12998015d" +SRCREV = "a1c4338ece021ed22b575be0502f2e733c739579" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3d6d5bb2906b7418dc158e2f1cf2ea1cb2f2ef1a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 30 Apr 2021 21:03:16 +0000 Subject: phosphor-logging: srcrev bump a1c4338ece..60356ad409 Patrick Williams (7): build: meson support for libphosphor-logging build: meson support for phosphor-log-manager build: meson support for test-utils build: meson support for unit tests build: meson support for rsyslog-config build: meson support for openpower-pel extensions build: adjust meson dependency for cereal Change-Id: I380f33f291bc85a43212db2ab4b41dfb49195a80 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c6ba5c6d4..a5b6990fe 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -52,7 +52,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "a1c4338ece021ed22b575be0502f2e733c739579" +SRCREV = "60356ad409fd51703ba2ac7ea13df3d7f0426d0c" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2d52a389366be11fed6a81378b0669e2c274f220 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 30 Apr 2021 10:27:59 -0500 Subject: phosphor-logging: convert to meson Signed-off-by: Patrick Williams Change-Id: I2a5eb57d100ced02043bf68f64e4596c59da6ebd --- .../recipes-phosphor/logging/phosphor-logging_git.bb | 20 +++++++------------- .../logging/phosphor-logging_%.bbappend | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index a5b6990fe..e714a8e26 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -7,13 +7,12 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig +inherit meson inherit python3native inherit obmc-phosphor-dbus-service inherit phosphor-logging inherit phosphor-dbus-yaml -DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" @@ -56,21 +55,16 @@ SRCREV = "60356ad409fd51703ba2ac7ea13df3d7f0426d0c" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "metadata-processing" - -PACKAGECONFIG[metadata-processing] = " \ - --enable-metadata-processing, \ - --disable-metadata-processing, , \ - " +PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ - --enable-openpower-pel-extension, \ - --disable-openpower-pel-extension, \ + -Dopenpower-pel-extension=enabled, \ + -Dopenpower-pel-extension=disabled, \ nlohmann-json cli11 pldm, \ python3, \ " -EXTRA_OECONF = " \ - YAML_DIR=${STAGING_DIR_TARGET}${yaml_dir} \ - CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ +EXTRA_OEMESON = " \ + -Dyamldir=${STAGING_DIR_TARGET}${yaml_dir} \ + -Dcallout_yaml=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ " diff --git a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend index 75f5e7ebe..264423933 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_gbs = " ERROR_INFO_CAP=256" +EXTRA_OEMESON_append_gbs = " -Derror_info_cap=256" -- cgit v1.2.3 From 8b02958e874418000823a3c36f23f109cdc5e4af Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 3 May 2021 15:41:08 +0000 Subject: phosphor-logging: srcrev bump 60356ad409..011ccae099 Miguel Gomez (1): Add a termination error display option in peltool Change-Id: I1bdb2041a3852f0479785dfb6e9513ad01f5179d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index e714a8e26..f0bd4a079 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -51,7 +51,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "60356ad409fd51703ba2ac7ea13df3d7f0426d0c" +SRCREV = "011ccae09944d1773106903ca46b89b6e54e0045" S = "${WORKDIR}/git" -- cgit v1.2.3 From b1cad9014cde289aec2d328b83656e71f429acbe Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 4 May 2021 18:31:11 +0000 Subject: phosphor-logging: srcrev bump 011ccae099..ef9cc07e13 Patrick Williams (1): build: remove autotools support Change-Id: Ia3718a6cff429e85e8044a0dbb48254d53c51a80 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index f0bd4a079..15d4d1abf 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -51,7 +51,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "011ccae09944d1773106903ca46b89b6e54e0045" +SRCREV = "ef9cc07e136e1f8140ac9b557fd068f6e721e683" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3efc8f652fd08d3603156593427ac114193b0993 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 5 May 2021 14:21:00 +0000 Subject: phosphor-logging: srcrev bump ef9cc07e13..81b4dcabb7 Vijay Lobo (1): PEL: Update filling VPD fields in PEL Change-Id: I2c97890461d710dd0e3229aa14b1efbb1b3a6bc6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 15d4d1abf..001d04384 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -51,7 +51,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "ef9cc07e136e1f8140ac9b557fd068f6e721e683" +SRCREV = "81b4dcabb715ed1ebad93dc1b2273307d126f425" S = "${WORKDIR}/git" -- cgit v1.2.3 From 5350a0e7b7c04c3d7ba50bfd6d6d80d6ba321717 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 11 May 2021 21:41:05 +0000 Subject: phosphor-logging: srcrev bump 81b4dcabb7..adf070b8c5 Anton D. Kachalov (1): Install systemd unit & busconfig ACLs from the package. Matt Spinler (1): PEL: Fan pres-detect conflict message reg entry Change-Id: I52fd588a59e2aab7d48e095be121f39300fc7bec Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 001d04384..6bb23546f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -51,7 +51,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "81b4dcabb715ed1ebad93dc1b2273307d126f425" +SRCREV = "adf070b8c5fa1fe5de473bd58aae5c138fce25d8" S = "${WORKDIR}/git" -- cgit v1.2.3 From 57ef7c2379fb25ec9a6389ac7773b00ffe864e38 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 12 May 2021 15:11:02 +0000 Subject: phosphor-logging: srcrev bump adf070b8c5..3160a544ed Sumit Kumar (1): PEL: Update system info into HB PEL extended user data section Change-Id: I09d4f7e67496ccdc73d9adee72458d8b399bb2c8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 6bb23546f..895cf9d6e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -51,7 +51,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "adf070b8c5fa1fe5de473bd58aae5c138fce25d8" +SRCREV = "3160a544ed041d5a2f7617e1d1deb8533fbf8059" S = "${WORKDIR}/git" -- cgit v1.2.3 From 8e2f55de9148065559a27268ce07d79009b9892a Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Wed, 31 Mar 2021 09:13:02 +0200 Subject: phosphor-logging: install config from the own repo This change required is a part of privilege separation work: https://github.com/openbmc/openbmc/issues/3383 This change should be merged after individual repo change: https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-logging/+/41835 Signed-off-by: Anton D. Kachalov Change-Id: I6243736cd0ce1ecccb2b164068dccf05d01ab6ad --- .../phosphor-logging/xyz.openbmc_project.Logging.service | 12 ------------ .../xyz.openbmc_project.Syslog.Config.service | 12 ------------ .../recipes-phosphor/logging/phosphor-logging_git.bb | 3 +++ 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service delete mode 100644 meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service deleted file mode 100644 index 77936c72d..000000000 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Log Manager - -[Service] -ExecStart=/usr/bin/env phosphor-log-manager -SyslogIdentifier=phosphor-log-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service deleted file mode 100644 index e1b1d667a..000000000 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Rsyslog config updater - -[Service] -ExecStart=/usr/bin/env phosphor-rsyslog-conf -SyslogIdentifier=phosphor-rsyslog-conf -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 895cf9d6e..c861fd4b8 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -38,8 +38,11 @@ ALLOW_EMPTY_${PN} = "1" PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}" DBUS_PACKAGES = "${LOGGING_PACKAGES}" +USERADD_PACKAGES = "${PN}-base" +GROUPADD_PARAM_${PN}-base = "-r phosphor-logging" FILES_${PN}-base += " \ + ${sysconfdir}/dbus-1 \ ${bindir}/phosphor-log-manager \ ${libdir}/libphosphor_logging.so.* \ " -- cgit v1.2.3 From 8b71f44f5ae1a534ffe813ef0ccf6aedfc9bb6d7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 14 May 2021 18:30:58 +0000 Subject: phosphor-logging: srcrev bump 3160a544ed..cad16201f8 Matt Spinler (2): PEL: Remove hardcoded sev for Hard shutdown err PEL: Update callouts for fan missing error Sumit Kumar (1): PEL: Update serverFWRelVer in ext user header section Change-Id: I6552dd19af2e77fa5b9f207e38df1d3e2e1a1b0c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c861fd4b8..c7117f37e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "3160a544ed041d5a2f7617e1d1deb8533fbf8059" +SRCREV = "cad16201f83a1a91b29781cff26e9e09158cae0e" S = "${WORKDIR}/git" -- cgit v1.2.3 From c55b45ef5180a132a6838dca1b61f91d48166571 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 20 May 2021 13:21:24 +0000 Subject: phosphor-logging: srcrev bump cad16201f8..9d59d58566 Matt Spinler (2): PEL: Don't bootblock on recovered PELs PEL: Fixes for GCC11 Change-Id: Idc4dedf6324ff60b9778be5b70f153ad43a0ac71 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c7117f37e..1b1e97d7e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "cad16201f83a1a91b29781cff26e9e09158cae0e" +SRCREV = "9d59d585667c96799c8218749318b5658b934839" S = "${WORKDIR}/git" -- cgit v1.2.3 From 33613dcb3d0012896a70d94de9e4c7a4f957d633 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 20 May 2021 18:31:03 +0000 Subject: phosphor-logging: srcrev bump 9d59d58566..0b08776a88 William A. Kennington III (1): build: Fix cereal dependency Change-Id: I97e3a6751e63d908d3815bd82e50c2f65dd21f56 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 1b1e97d7e..4e47e373b 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "9d59d585667c96799c8218749318b5658b934839" +SRCREV = "0b08776a882357d7e96ee072d14ba0940287ca93" S = "${WORKDIR}/git" -- cgit v1.2.3