From 460ca24018fdc48d967480a4fa54f291ea7a6eaf Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 10 Sep 2021 22:32:22 -0500 Subject: meta-phosphor: os-release: add indirect for root directory The `run_git` in phosphor's os-release.bbappend assumes that the git repository is in `${COREBASE}`, which is the location of the `meta/` subdirectory. This is true when building exclusively the `openbmc` tree but may not be the case when external users attempt to use the `openbmc` tree as a git-submodule. Create an indirection (`OS_RELEASE_ROOTPATH`) which defaults to `COREBASE`, but allows an override for those other use-cases. Signed-off-by: Patrick Williams Change-Id: I4e0171e065379c5030a36ea5be774b5db78bfe34 --- meta-phosphor/recipes-core/os-release/os-release.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index de9a02f27..7e90ab3fb 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -5,9 +5,11 @@ # and pasting into another recipe ensure it is understood # what that means! +OS_RELEASE_ROOTPATH ?= "${COREBASE}" + def run_git(d, cmd): try: - oeroot = d.getVar('COREBASE', True) + oeroot = d.getVar('OS_RELEASE_ROOTPATH', True) return bb.process.run(("export PSEUDO_DISABLED=1; " + "git --work-tree %s --git-dir %s/.git %s") % (oeroot, oeroot, cmd))[0].strip('\n') -- cgit v1.2.3 From d1414ee0a247a0c3a9693fc092ab0a967baa11ab Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 31 Aug 2021 13:21:26 -0500 Subject: meta-phosphor: dbus-sensors: add phosphor-logging dependency In prep for Ib408e97ff99863cd91bcbcb43a4738d773f4e21c, add the necessary dependency for phosphor-logging. Signed-off-by: Patrick Williams Change-Id: I2a67d940da9598250e9884c35006f670f68efc72 --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index d37cbbdfe..d6bd9b596 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -65,7 +65,14 @@ SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'external', \ 'xyz.openbmc_project.externalsensor.service', \ '', d)}" -DEPENDS = "boost nlohmann-json sdbusplus i2c-tools libgpiod" +DEPENDS = " \ + boost \ + i2c-tools \ + libgpiod \ + nlohmann-json \ + phosphor-logging \ + sdbusplus \ + " inherit meson systemd S = "${WORKDIR}/git" -- cgit v1.2.3 From 2214778fc4641c579e2bf4101c70843ded5d9577 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 13 Sep 2021 08:41:27 -0500 Subject: busybox: switch SRC_URI to single-append style Signed-off-by: Patrick Williams Change-Id: I494bb2352ba068f02dab761fabc7cfcae6a70eb9 --- meta-phosphor/recipes-core/busybox/busybox_%.bbappend | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend index a64c1443a..f8800b45a 100644 --- a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend +++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend @@ -1,6 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://busybox.cfg" -SRC_URI += "file://flash.cfg" -SRC_URI += "file://less.cfg" -SRC_URI += "file://mountpoint.cfg" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', '', 'file://reboot.cfg', d)}" +SRC_URI += " \ + file://busybox.cfg \ + file://flash.cfg \ + file://less.cfg \ + file://mountpoint.cfg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', \ + '', 'file://reboot.cfg', d)} \ +" -- cgit v1.2.3 From eafbeefae6c2a50a18a27c6b830ce11b872f6f76 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 00:01:09 +0000 Subject: phosphor-power: srcrev bump 1fd0b14587..3d8e295a02 Adriana Kobylak (1): clang updates Patrick Williams (1): clang-format: apply clang-12 changes Change-Id: I458f6e24203a239399cc54b009df790ef7c491b7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index bcca05930..48b25595d 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "1fd0b145874a089e2ccd11f3960342059eeb7012" +SRCREV = "3d8e295a02d90c87877358b248b5ec8d00016ea1" -- cgit v1.2.3 From 95cd380b4d2962fc71ec5088ab7009d4d8afc5bc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Sep 2021 22:30:57 +0000 Subject: bmcweb: srcrev bump 7bb985eeb0..9a69d5a5ef Ali Ahmed (1): Add SystemType to Systems/hypervisor Ed Tanous (4): Remove unused variables in connection class Rearrange/clean code in connection fix clang formatting Clear UserSession in between requests John Edward Broadbent (2): Change ownership of boost::req to crow::req Corrects issues in session Change-Id: Idaacee582adc86dcbe70d8dfa59fa6984fb255fa Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index f7d2413ef..3f0c3a8c0 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "7bb985eeb0930905c2f4d551e895dd5293094931" +SRCREV = "9a69d5a5efde522fccac2fcbf50052a73aaab671" S = "${WORKDIR}/git" -- cgit v1.2.3 From 42790bc5239bcc698061488c3d80383a05db458d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Sep 2021 21:01:15 +0000 Subject: dbus-sensors: srcrev bump 5ab424a6a4..0c42f40e55 Patrick Williams (2): build: add phosphor-logging dep and wrap logging: replace direct journal calls with lg2 Change-Id: Ib0eedad0b41c9848a09da3313717ca594d5ad59a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index d6bd9b596..d5df353fc 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "5ab424a6a4ea56e5fbfad5a1813bed7bfabbd399" +SRCREV = "0c42f40e55fd4fe6274962ea17e804f49f5de19e" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 83ff0f8dbc0bf06fa0c8d9d0ac06a1439f9b701e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Sep 2021 06:41:22 +0000 Subject: webui-vue: srcrev bump aaff26ef82..bfb3469467 Konstantin Aladyshev (2): Russian translations for the POST code page Sync ru-RU translation file with the en-US file Change-Id: If1f76c6350bc9b393569abae2e2e23424c2b8ebf Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index cd155b7da..6363bb2ba 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "aaff26ef8262df7d6b5bfdd5da52b75a158a4ec5" +SRCREV = "bfb346946727f09d99c1710e0443dcda2e8544a5" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From e9ec0c10bc922b12b4086fe95850d9684c7f0b87 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Sep 2021 06:01:11 +0000 Subject: pldm: srcrev bump 430aaee501..e5268cda73 Tom Joseph (1): Refactor the verbose tracing in PLDM Change-Id: I5bed3b2087068a6359db4b146056388cf20ecbef Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 68b4ece2a..4e812c975 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "430aaee5013789862de586473b43d2191d492a41" +SRCREV = "e5268cda7389820cfc76142218dd149c76c59fe6" -- cgit v1.2.3 From a063fc1fb02efafc397025fa0372cb83d692ce61 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 11 Sep 2021 21:30:38 +0000 Subject: stdplus: srcrev bump 5e3b13f022..1775926327 Patrick Williams (1): clang-format: apply clang-12 changes Change-Id: Ifae2213b7017b98ce3530c44fe8c9cc256187703 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/stdplus/stdplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 875f178c5..9306b6f8b 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "5e3b13f0224afb09bae9f32e7ab4464d34afcb1f" +SRCREV = "17759263274090e4f8e4b8e52f99f0a9cc095ba8" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2e7aa0a46c0dd32db2054949542f527e6339f405 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Sep 2021 22:11:09 +0000 Subject: smbios-mdr: srcrev bump 511b06c05d..ecbd71baa6 Mansi Joshi (1): Fix SMMDR send directory info call Change-Id: I7205ebf2167ac89fd0c518d1ed4c1efa709fe7d9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index f5a046bc9..0cc97ac8c 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -28,7 +28,7 @@ EXTRA_OECMAKE = "-DYOCTO=ON" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/smbios-mdr.git" -SRCREV = "511b06c05d43c217aa5d7620bd052fafda09d586" +SRCREV = "ecbd71baa68d0c2834614d84f24de7d369a51ce4" SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" -- cgit v1.2.3 From be7e444dfcecd2f2057b4c54e1a33f9ffac5778f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Sep 2021 21:01:42 +0000 Subject: peci-pcie: srcrev bump 6f55203b70..8e96603605 Andrei Kartashev (1): Refactor handling CPUInfo array Change-Id: I35c6200e0a67b2b962cd629ea4c9efb3a8cfa698 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index 6cc4fd8d4..2cdbc5c56 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "6f55203b70316baec228073abcd581b64985af93" +SRCREV = "8e96603605eebd574bb00cd35e7fa118071aeeae" S = "${WORKDIR}/git" -- cgit v1.2.3 From a63d7f98ea1bd2aa47ea056751a63f5e56c128e0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 8 Sep 2021 20:00:24 -0700 Subject: systemd: Fix RA receiving with newer kernels Currently, all received RAs are dropped by systemd-networkd with an internal error code. Change-Id: I8df0b587e4d6504c624940ee04f923ba6f166c3f Signed-off-by: William A. Kennington III --- ...-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch | 89 ++++++++++++++++++++++ .../recipes-core/systemd/systemd_249.3.bbappend | 6 ++ 2 files changed, 95 insertions(+) create mode 100644 meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch create mode 100644 meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch new file mode 100644 index 000000000..3e376ed3a --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch @@ -0,0 +1,89 @@ +diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h +index f92e425fd6..09e606614c 100644 +--- a/src/basic/socket-util.h ++++ b/src/basic/socket-util.h +@@ -277,6 +277,28 @@ static inline int getsockopt_int(int fd, int level, int optname, int *ret) { + int socket_bind_to_ifname(int fd, const char *ifname); + int socket_bind_to_ifindex(int fd, int ifindex); + ++/* Define a 64bit version of timeval/timespec in any case, even on 32bit userspace. */ ++struct timeval_large { ++ uint64_t tvl_sec, tvl_usec; ++}; ++struct timespec_large { ++ uint64_t tvl_sec, tvl_nsec; ++}; ++ ++/* glibc duplicates timespec/timeval on certain 32bit archs, once in 32bit and once in 64bit. ++ * See __convert_scm_timestamps() in glibc source code. Hence, we need additional buffer space for them ++ * to prevent from recvmsg_safe() returning -EXFULL. */ ++#define CMSG_SPACE_TIMEVAL \ ++ ((sizeof(struct timeval) == sizeof(struct timeval_large)) ? \ ++ CMSG_SPACE(sizeof(struct timeval)) : \ ++ CMSG_SPACE(sizeof(struct timeval)) + \ ++ CMSG_SPACE(sizeof(struct timeval_large))) ++#define CMSG_SPACE_TIMESPEC \ ++ ((sizeof(struct timespec) == sizeof(struct timespec_large)) ? \ ++ CMSG_SPACE(sizeof(struct timespec)) : \ ++ CMSG_SPACE(sizeof(struct timespec)) + \ ++ CMSG_SPACE(sizeof(struct timespec_large))) ++ + ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags); + + int socket_get_family(int fd, int *ret); +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index a0695ec519..abd52f7c14 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -1277,7 +1277,7 @@ int server_process_datagram( + * identical to NAME_MAX. For now we use that, but this should be updated one day when the final + * limit is known. */ + CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) + +- CMSG_SPACE(sizeof(struct timeval)) + ++ CMSG_SPACE_TIMEVAL + + CMSG_SPACE(sizeof(int)) + /* fd */ + CMSG_SPACE(NAME_MAX) /* selinux label */) control; + +diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c +index 67c6b55d84..823be0f275 100644 +--- a/src/libsystemd-network/icmp6-util.c ++++ b/src/libsystemd-network/icmp6-util.c +@@ -149,7 +149,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, + triple_timestamp *ret_timestamp) { + + CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */ +- CMSG_SPACE(sizeof(struct timeval))) control; ++ CMSG_SPACE_TIMEVAL) control; + struct iovec iov = {}; + union sockaddr_union sa = {}; + struct msghdr msg = { +@@ -186,7 +186,6 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, + + /* namelen == 0 only happens when running the test-suite over a socketpair */ + +- assert(!(msg.msg_flags & MSG_CTRUNC)); + assert(!(msg.msg_flags & MSG_TRUNC)); + + CMSG_FOREACH(cmsg, &msg) { +diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c +index 9d874cfc8a..648e804105 100644 +--- a/src/timesync/timesyncd-manager.c ++++ b/src/timesync/timesyncd-manager.c +@@ -412,7 +412,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re + .iov_base = &ntpmsg, + .iov_len = sizeof(ntpmsg), + }; +- CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct timespec))) control; ++ CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control; + union sockaddr_union server_addr; + struct msghdr msghdr = { + .msg_iov = &iov, +@@ -467,6 +467,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re + + switch (cmsg->cmsg_type) { + case SCM_TIMESTAMPNS: ++ assert(cmsg->cmsg_len == CMSG_LEN(sizeof(struct timespec))); ++ + recv_time = (struct timespec *) CMSG_DATA(cmsg); + break; + } diff --git a/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend new file mode 100644 index 000000000..6ab1a6ab0 --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend @@ -0,0 +1,6 @@ +# Backport a fix that is only in main, otherwise all received RAs will fail +# to be parsed. +SRC_URI += "file://0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch" + +# Pin to v249.4 to fix systemd-networkd segfaults. +SRCREV = "4d8fd88b9641fce81272f60f556543f713175403" -- cgit v1.2.3 From 4612c8a0f27f9fa86db27a65250e263e805eeb0f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 01:11:21 +0000 Subject: pldm: srcrev bump e5268cda73..a6678d7445 George Liu (1): Update clang-format Change-Id: I0ad894ebd8caf2bc62b500f4e7e167bdb9e8dc81 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 4e812c975..f681cfe16 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "e5268cda7389820cfc76142218dd149c76c59fe6" +SRCREV = "a6678d74457e790922305b7de48d15554a0651e5" -- cgit v1.2.3 From 57bf5bcc2ebbc6b738a12691bb60903ced608dd3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 22:51:06 +0000 Subject: phosphor-host-ipmid: srcrev bump 7a3296df0c..c2af98befb Jayaprakash Mutyala (1): Master Write-Read: Validate reserved field content Change-Id: I2390ef052ea1c593681ebf3a547ca92d03f2b6bc Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 3013ee9b1..d5fb2a56b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "7a3296df0c2f9b8e04e5b60942fba086f999e1b9" +SRCREV = "c2af98befb8ce52f9e290793e756ad12da0ef2bf" -- cgit v1.2.3 From e936187a5939de7b11552d4db8317f6b49119940 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 21:31:18 +0000 Subject: phosphor-state-manager: srcrev bump 0a675215d6..2bfb1efc4b Tim Lee (1): bmc-state-manager: Add support BMC Reboot Cause feature Change-Id: I1758df4efde9dec8981c400d95bee740cf1737a7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 2e3b3b1cf..befda3ff3 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -182,6 +182,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "0a675215d6a6d2eb13e030ba0f618a4691de58d4" +SRCREV = "2bfb1efc4bc7e781224e19c05b51e6675f13a488" S = "${WORKDIR}/git" -- cgit v1.2.3 From afd8da73dd72b87b575ba0622fd97b7ca5ffa94e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 20:41:12 +0000 Subject: phosphor-power: srcrev bump 3d8e295a02..e97fc13a6f Shawn McCarney (7): regulators: Clear phase fault history in Device regulators: Simplify Chassis test cases regulators: Add detectPhaseFaults() to Chassis regulators: Simplify System test cases regulators: Add detectPhaseFaults() to System regulators: Enable phase fault detection regulators: Fix race condition in monitor disable Change-Id: I3ca7bf31b10fb03548c99c04057da770695a1df6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 48b25595d..64ffe4c22 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "3d8e295a02d90c87877358b248b5ec8d00016ea1" +SRCREV = "e97fc13a6f3253327b60120bd56c571efa29c2d0" -- cgit v1.2.3 From 4740a9a769bf9d0f9ced74e1e5f7a9609c39a534 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 20:01:29 +0000 Subject: webui-vue: srcrev bump bfb3469467..4928206943 Sneha Patel (1): Remove unnecessary span from toggle component Change-Id: If216d4dd69019e0fe2ba483f4c650917b2681550 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 6363bb2ba..75dcddd10 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "bfb346946727f09d99c1710e0443dcda2e8544a5" +SRCREV = "4928206943a094beab60f2d91ee7e9c9174b6223" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 0d21747a005bb84b3ad5578eeb2b37fa317aa8e0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 16:51:54 +0000 Subject: x86-power-control: srcrev bump ec972d8b56..50937e7339 Jean-Marie Verdun (1): Add initial support for polarity on a couple of GPIOs Zev Weiss (2): Append node number to dbus names more directly Fix powerControlDir creation failure error message Change-Id: I7299ba7115a2ea17ef7daefc9da1fc3796da29e4 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index e1d341570..53de8c616 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "ec972d8b56fe84f8aa6d18f63e64e3fb0e7a9eaf" +SRCREV = "50937e7339db744f765efdc3cc58f3d0c5976601" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From 9ef4b09ba3a5ac7740a9167bfc4157b693283030 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 11:21:21 +0000 Subject: phosphor-led-manager: srcrev bump 7152edcff6..d870d68a21 George Liu (2): Add GeorgeLiu as the Reviewer Update clang-format Vishwanatha Subbanna (1): Add Patrick as the Maintainer Change-Id: I075aa936f782e993a6427cf266054421f8bfd1f1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 544beae35..f47d8c91b 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "7152edcff6b44cd3b32ced057c1fd2e6ac6402e9" +SRCREV = "d870d68a21066c747b9d574507a9e5109bd35502" -- cgit v1.2.3 From 40d8791a183e977271c4605960c1c987fee97760 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 11:20:50 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 6b50623459..40a42aa5db Brandon Kim (1): Add Model property to Cpu Interface Change-Id: I30076561b0553b27f8d60afdc85e904a6cce1cfe Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 4132585f5..14e6a08fb 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "6b50623459b54af222cb9a79c5a0c7912c92da41" +SRCREV = "40a42aa5db808bf791135461e924259de0429f69" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From d394b7701d047c8886804f9583252bdc5351c572 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 10:31:10 +0000 Subject: phosphor-networkd: srcrev bump b108fd740f..2c0fc56805 Tejas Patil (1): Add support for MTU property Change-Id: I76c79f663a143c1e6cc72cf0d66eaf0bea7d50aa Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 94b3eca46..c553e6dad 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "b108fd740fdde4a9f0fe63e63ccdee695f5b92e7" +SRCREV = "2c0fc568057c5575a75ad638ea91bc8c65b57160" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From 468863a36d1bbe2ae21ca051c2901bb886750ddc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Sep 2021 05:40:47 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 4ce901c5fb..f2cc64c666 Lei YU (1): meson_options: Enable all features by default Change-Id: Ia287c5818adaab33c4f09487b8cdd3cb8f190742 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 2e36e99aa..3d9155998 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "4ce901c5fb910213896a3804e57e5f74f795a020" +SRCREV = "f2cc64c666899b43e559be3167ed561989dbfc34" -- cgit v1.2.3 From d13afc1b77dc9a7d6bc701aba3530f3db984574e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 15 Sep 2021 15:24:21 -0700 Subject: systemd: Patch systemd-networkd SEGFAULT Possibly a bug in the CMSG logic in glibc, workaround being submitted to systemd as https://github.com/systemd/systemd/pull/20752. Change-Id: Ie8aeecd6bbfd329c2b9c18980d823d4722c01428 Signed-off-by: William A. Kennington III --- ...work-timesync-fix-segfault-on-32bit-timev.patch | 66 ++++++++++++++++++++++ .../recipes-core/systemd/systemd_249.3.bbappend | 4 ++ 2 files changed, 70 insertions(+) create mode 100644 meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch new file mode 100644 index 000000000..c3af62e15 --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch @@ -0,0 +1,66 @@ +From 83676e4278cecb44316e6ae88e1365e6fcfdd4ff Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Wed, 15 Sep 2021 23:29:11 +0900 +Subject: [PATCH] journal,network,timesync: fix segfault on 32bit + timeval/timespec systems + +Fixes #20741. +--- + src/journal/journald-server.c | 7 +++++-- + src/libsystemd-network/icmp6-util.c | 3 ++- + src/timesync/timesyncd-manager.c | 3 ++- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index abd52f7c14..2d1d9e66d7 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -1275,11 +1275,14 @@ int server_process_datagram( + /* We use NAME_MAX space for the SELinux label here. The kernel currently enforces no limit, but + * according to suggestions from the SELinux people this will change and it will probably be + * identical to NAME_MAX. For now we use that, but this should be updated one day when the final +- * limit is known. */ ++ * limit is known. ++ * ++ * Here, we need to explicitly initialize the buffer with zero, as glibc has a bug in ++ * __convert_scm_timestamps(), which assumes the buffer is initialized. See #20741. */ + CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE_TIMEVAL + + CMSG_SPACE(sizeof(int)) + /* fd */ +- CMSG_SPACE(NAME_MAX) /* selinux label */) control; ++ CMSG_SPACE(NAME_MAX) /* selinux label */) control = {}; + + union sockaddr_union sa = {}; + +diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c +index 823be0f275..3832bbd920 100644 +--- a/src/libsystemd-network/icmp6-util.c ++++ b/src/libsystemd-network/icmp6-util.c +@@ -148,8 +148,9 @@ int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) { + int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, + triple_timestamp *ret_timestamp) { + ++ /* This needs to be initialized with zero. See #20741. */ + CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */ +- CMSG_SPACE_TIMEVAL) control; ++ CMSG_SPACE_TIMEVAL) control = {}; + struct iovec iov = {}; + union sockaddr_union sa = {}; + struct msghdr msg = { +diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c +index 648e804105..e37db1c570 100644 +--- a/src/timesync/timesyncd-manager.c ++++ b/src/timesync/timesyncd-manager.c +@@ -412,7 +412,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re + .iov_base = &ntpmsg, + .iov_len = sizeof(ntpmsg), + }; +- CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control; ++ /* This needs to be initialized with zero. See #20741. */ ++ CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control = {}; + union sockaddr_union server_addr; + struct msghdr msghdr = { + .msg_iov = &iov, +-- +2.33.0.309.g3052b89438-goog + diff --git a/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend index 6ab1a6ab0..1a58ca139 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend @@ -4,3 +4,7 @@ SRC_URI += "file://0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.pat # Pin to v249.4 to fix systemd-networkd segfaults. SRCREV = "4d8fd88b9641fce81272f60f556543f713175403" + +# Additional unsubmitted PR #20752 required to fix additional systemd-networkd +# segfaults. +SRC_URI += "file://0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch" -- cgit v1.2.3 From 605c37cb989a95c02633fcb93efb45102781b4bb Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 15 Sep 2021 09:12:36 +0930 Subject: bitbake: Use IPK packaging for rootfs assembly bitbake offers a choice of DEB, RPM or IPK packaging. To a degree the choice is functionally arbitrary for image generation but control over the package format becomes important if we want to: 1. Include runtime package management functionality in the firmware image 2. Mess about with the packages on the build system With respect to 1 the IPK format and opkg (an ipk package manager) are designed for embedded systems[1] - by contrast to RPMs have heavier dependencies and a greater impact on the size and complexity of the firmware image. Regarding 2, the embedded nature and the need for opkg to work without much fuss leads to a lower configuration barrier by comparison to RPMs. With ipk it becomes possible to reuse the packages built during image preparation for core analysis without needing to generate an SDK: ``` $ export LD_LIBRARY_PATH=./tmp/work/x86_64-linux/opkg-native/*/recipe-sysroot-native/usr/lib $ MY_DEBUG_ROOT=tmp/rootfs-debug $ ./tmp/sysroots-components/x86_64/opkg-native/usr/bin/opkg \ -f ./tmp/work/p10bmc-openbmc-linux-gnueabi/obmc-phosphor-image/*/opkg.conf \ -o $MY_DEBUG_ROOT \ update $ fakeroot ./tmp/sysroots-components/x86_64/opkg-native/usr/bin/opkg \ -f ./tmp/work/p10bmc-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/opkg.conf \ -o $MY_DEBUG_ROOT \ install dbus-sensors dbus-sensors-dbg $ gdb-multiarch (gdb) set solib-absolute-prefix .../tmp/rootfs-debug (gdb) add-auto-load-safe-path .../tmp/rootfs-debug (gdb) file tmp/rootfs-debug/usr/bin/nvmesensor (gdb) core-file obmcdump_17_9597/core.nvmesensor.0.aae91b519d0e4e0e8bbe746e3f6cd25f.2779.9594000000 Core was generated by `/usr/bin/nvmesensor'. Program terminated with signal SIGABRT, Aborted. pthread_kill.c:45 45 pthread_kill.c: No such file or directory. (gdb) bt pthread_kill.c:45 ../sysdeps/posix/raise.c:26 /home/andrew/src/openbmc/openbmc/build/p10bmc/tmp/rootfs-debug/usr/lib/libstdc++.so.6 /home/andrew/src/openbmc/openbmc/build/p10bmc/tmp/rootfs-debug/usr/lib/libstdc++.so.6 /home/andrew/src/openbmc/openbmc/build/p10bmc/tmp/rootfs-debug/usr/lib/libstdc++.so.6 /home/andrew/src/openbmc/openbmc/build/p10bmc/tmp/rootfs-debug/usr/lib/libstdc++.so.6 "xyz.openbmc_project.NVMeSensor", this=0x488f04) at /usr/include/sdbusplus/bus.hpp:234 ../../../../../../workspace/sources/dbus-sensors/src/NVMeSensorMain.cpp:159 (gdb) ``` This approach documented in the Poky Reference Manual: https://www.yoctoproject.org/docs/1.0/poky-ref-manual/poky-ref-manual.html#platdev-gdb-remotedebug-launch-gdb-inferiorbins Switch all machines to IPK to align the debugging experience with upstream's documentation and to facilitate efficient use of packaged software at runtime. [1] https://openwrt.org/docs/guide-user/additional-software/opkg Change-Id: I8ef526add2d7a6790de1b3eb3fb85cd39b864f23 Signed-off-by: Andrew Jeffery Signed-off-by: Patrick Williams --- meta-alibaba/meta-thor/conf/local.conf.sample | 2 +- meta-amd/meta-ethanolx/conf/local.conf.sample | 2 +- meta-ampere/meta-jade/conf/local.conf.sample | 2 +- meta-asrock/meta-e3c246d4i/conf/local.conf.sample | 2 +- meta-bytedance/meta-g220a/conf/local.conf.sample | 2 +- meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample | 2 +- meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample | 2 +- meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample | 2 +- meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample | 2 +- meta-evb/meta-evb-raspberrypi/conf/local.conf.sample | 2 +- meta-fii/meta-kudo/conf/local.conf.sample | 2 +- meta-hpe/meta-dl360poc/conf/local.conf.sample | 2 +- meta-hxt/meta-stardragon4800-rep2/conf/local.conf.sample | 2 +- meta-ibm/conf/local.conf.sample | 2 +- meta-ibm/meta-palmetto/conf/local.conf.sample | 2 +- meta-ibm/meta-romulus/conf/local.conf.sample | 2 +- meta-ingrasys/meta-zaius/conf/local.conf.sample | 2 +- meta-inspur/meta-fp5280g2/conf/local.conf.sample | 2 +- meta-inspur/meta-on5263m5/conf/local.conf.sample | 2 +- meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample | 2 +- meta-inventec/meta-lanyang/conf/local.conf.sample | 2 +- meta-lenovo/meta-hr630/conf/local.conf.sample | 2 +- meta-lenovo/meta-hr855xg2/conf/local.conf.sample | 2 +- meta-microsoft/meta-olympus/conf/local.conf.sample | 2 +- meta-phosphor/conf/local.conf.sample | 2 +- meta-portwell/meta-neptune/conf/local.conf.sample | 2 +- meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample | 2 +- meta-quanta/meta-f0b/conf/local.conf.sample | 2 +- meta-quanta/meta-gbs/conf/local.conf.sample | 2 +- meta-quanta/meta-gsj/conf/local.conf.sample | 2 +- meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample | 2 +- meta-quanta/meta-q71l/conf/local.conf.sample | 2 +- meta-supermicro/meta-x11spi/conf/local.conf.sample | 2 +- meta-yadro/meta-nicole/conf/local.conf.sample | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-alibaba/meta-thor/conf/local.conf.sample b/meta-alibaba/meta-thor/conf/local.conf.sample index d4f9771ff..1f6270704 100644 --- a/meta-alibaba/meta-thor/conf/local.conf.sample +++ b/meta-alibaba/meta-thor/conf/local.conf.sample @@ -76,7 +76,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture # diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/local.conf.sample index 27e36f84d..893efed79 100644 --- a/meta-amd/meta-ethanolx/conf/local.conf.sample +++ b/meta-amd/meta-ethanolx/conf/local.conf.sample @@ -104,7 +104,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample index 1d3c71471..413eefcf9 100644 --- a/meta-ampere/meta-jade/conf/local.conf.sample +++ b/meta-ampere/meta-jade/conf/local.conf.sample @@ -82,7 +82,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample index fa8e7f068..43a5b96ee 100644 --- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample +++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "e3c246d4i" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/local.conf.sample index f931cdd21..e6f1ca458 100644 --- a/meta-bytedance/meta-g220a/conf/local.conf.sample +++ b/meta-bytedance/meta-g220a/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "g220a" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample index b741111a0..f4d2b3b0e 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "evb-ast2500" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample index 264d45fbc..387ea77da 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "evb-ast2600" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample index 244eec31d..bd13d5717 100644 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample +++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "evb-zx3-pm3" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample index 44dce405c..9847926f5 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "evb-npcm750" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample index cbfcfe3f7..88b639111 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "raspberrypi" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index ed6eb492b..ad8272cf5 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "kudo" DISTRO ?= "openbmc-kudo" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-hpe/meta-dl360poc/conf/local.conf.sample b/meta-hpe/meta-dl360poc/conf/local.conf.sample index 41698669b..f8cce0589 100644 --- a/meta-hpe/meta-dl360poc/conf/local.conf.sample +++ b/meta-hpe/meta-dl360poc/conf/local.conf.sample @@ -84,7 +84,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture diff --git a/meta-hxt/meta-stardragon4800-rep2/conf/local.conf.sample b/meta-hxt/meta-stardragon4800-rep2/conf/local.conf.sample index b1776ba20..b02199a66 100644 --- a/meta-hxt/meta-stardragon4800-rep2/conf/local.conf.sample +++ b/meta-hxt/meta-stardragon4800-rep2/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "stardragon4800-rep2" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 172631b59..d68ee13ba 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -3,7 +3,7 @@ #MACHINE ?= "swift" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-openpower" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample index f421116e3..583ff0584 100644 --- a/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -104,7 +104,7 @@ DISTRO ?= "openbmc-openpower" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample index e600acace..135305745 100644 --- a/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-ibm/meta-romulus/conf/local.conf.sample @@ -84,7 +84,7 @@ DISTRO ?= "openbmc-openpower" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample index 31c3f919b..146172540 100644 --- a/meta-ingrasys/meta-zaius/conf/local.conf.sample +++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "zaius" DISTRO ?= "openbmc-openpower" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample index bb64c15eb..1e3361ff5 100644 --- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "fp5280g2" DISTRO ?= "openbmc-fp5280g2" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample index 6e212f30c..f829ce540 100644 --- a/meta-inspur/meta-on5263m5/conf/local.conf.sample +++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample @@ -104,7 +104,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample index c1a28e0b6..05cc9890e 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample +++ b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample @@ -84,7 +84,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture diff --git a/meta-inventec/meta-lanyang/conf/local.conf.sample b/meta-inventec/meta-lanyang/conf/local.conf.sample index ba34a1894..65a634665 100644 --- a/meta-inventec/meta-lanyang/conf/local.conf.sample +++ b/meta-inventec/meta-lanyang/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "lanyang" DISTRO ?= "openbmc-openpower" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-lenovo/meta-hr630/conf/local.conf.sample b/meta-lenovo/meta-hr630/conf/local.conf.sample index f652ced85..4b5eff3c5 100644 --- a/meta-lenovo/meta-hr630/conf/local.conf.sample +++ b/meta-lenovo/meta-hr630/conf/local.conf.sample @@ -2,7 +2,7 @@ #Licensed under BSD-3, see COPYING.BSD file for details." MACHINE ??= "hr630" DISTRO ?= "openbmc-hr630" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-lenovo/meta-hr855xg2/conf/local.conf.sample b/meta-lenovo/meta-hr855xg2/conf/local.conf.sample index b78cdc42b..c714f2f18 100644 --- a/meta-lenovo/meta-hr855xg2/conf/local.conf.sample +++ b/meta-lenovo/meta-hr855xg2/conf/local.conf.sample @@ -3,7 +3,7 @@ MACHINE ??= "hr855xg2" DISTRO ?= "openbmc-hr855xg2" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-microsoft/meta-olympus/conf/local.conf.sample b/meta-microsoft/meta-olympus/conf/local.conf.sample index dc18dce8b..14bc4c3e3 100755 --- a/meta-microsoft/meta-olympus/conf/local.conf.sample +++ b/meta-microsoft/meta-olympus/conf/local.conf.sample @@ -104,7 +104,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index 6056efd0d..98e6bd20f 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "qemuarm" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-portwell/meta-neptune/conf/local.conf.sample b/meta-portwell/meta-neptune/conf/local.conf.sample index 82edf0cd2..24d92e141 100644 --- a/meta-portwell/meta-neptune/conf/local.conf.sample +++ b/meta-portwell/meta-neptune/conf/local.conf.sample @@ -82,7 +82,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample b/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample index f5fa72cc5..444a903b2 100644 --- a/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample +++ b/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "centriq2400-rep" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/local.conf.sample index 40b76ba9c..147d6ced0 100644 --- a/meta-quanta/meta-f0b/conf/local.conf.sample +++ b/meta-quanta/meta-f0b/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "f0b" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample index bd20df653..21afe26ae 100644 --- a/meta-quanta/meta-gbs/conf/local.conf.sample +++ b/meta-quanta/meta-gbs/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "gbs" DISTRO ?= "gbmc" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index feaa9cd06..6cff5ea4d 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "gsj" DISTRO ?= "openbmc-gsj" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample index f77eea42b..73cac5b98 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample +++ b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "olympus-nuvoton" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample index 9fadf8298..99b70cc45 100644 --- a/meta-quanta/meta-q71l/conf/local.conf.sample +++ b/meta-quanta/meta-q71l/conf/local.conf.sample @@ -1,6 +1,6 @@ MACHINE ??= "quanta-q71l" DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats" diff --git a/meta-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/local.conf.sample index 2208aeee8..263a720b7 100644 --- a/meta-supermicro/meta-x11spi/conf/local.conf.sample +++ b/meta-supermicro/meta-x11spi/conf/local.conf.sample @@ -82,7 +82,7 @@ DISTRO ?= "openbmc-phosphor" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK/ADT target architecture diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index 041114d79..3a76adeac 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -84,7 +84,7 @@ DISTRO ?= "openbmc-openpower" # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" # We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture -- cgit v1.2.3 From 842eb7f21f9c9417999ffb930994639aad27125d Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Wed, 15 Sep 2021 18:47:42 +0530 Subject: Make soft-off service to be a soft dependency for host targets In the current state soft-off service is a hard dependency (requires) for the host shut down target, so in any case where the soft-off service fails with an error condition, the shutdown target fails too. This commit intends to make soft-off service as a soft dependency(wants) so that the shutdown target can still proceed even though the pldmsoftoff service fails for whatever reason. Signed-off-by: Manojkiran Eda Change-Id: I5650702c6eb71adab10fdb6493c9d582a9cb0129 --- meta-phosphor/recipes-phosphor/pldm/pldm_git.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index bcf1bed23..4c9cbc983 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -28,22 +28,22 @@ EXTRA_OEMESON = " \ # Install pldmSoftPowerOff.service in correct targets pkg_postinst:${PN} () { - mkdir -p $D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires - LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" + mkdir -p $D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires - LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" + mkdir -p $D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK } pkg_prerm:${PN} () { - LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" + LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants/pldmSoftPowerOff.service" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" + LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants/pldmSoftPowerOff.service" rm $LINK } -- cgit v1.2.3 From a9569c625ecaaade6d96e6f61c151eb6b8739132 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Sep 2021 15:40:55 +0000 Subject: bmcweb: srcrev bump 9a69d5a5ef..7de9f811db Ed Tanous (1): Fill in request earlier Sunitha Harish (1): EventService : Optimize event data buffers Change-Id: I8de1220b4c0f1bf804263d2692aac9891833ff76 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3f0c3a8c0..d5b95be14 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "9a69d5a5efde522fccac2fcbf50052a73aaab671" +SRCREV = "7de9f811db3400121e1453b1fa3da09ae6df69f6" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0698d19c04733b35a6ae08ee2ee9097deff846ab Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Sep 2021 13:10:46 +0000 Subject: phosphor-fan-presence: srcrev bump d9ec33a010..3edb065647 Matthew Barth (3): control: Use `poweron_target` in place of `full_speed` json: Handle compatible interface not existing yet control: Remove setting target = poweron target at startup Mike Capps (3): monitor: Subscribe to tach target and feedback services Monitor: Support hwmon service offline during startup Monitor - improved use of Inventory for Sensor func. state Change-Id: I6044b092861e67b13261c9b4f8c6b4ca4638e04c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index d34cef69f..15e5b4306 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "d9ec33a010dfbd7685ded4a4711f13609208fc32" +SRCREV = "3edb065647c2cb73d3593a168cd5452add63f75e" -- cgit v1.2.3 From 081a2d0bca1ee4709ba037f394af929d045ba58d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 18:11:27 +0000 Subject: phosphor-power: srcrev bump e97fc13a6f..54b3ab9b3d Shawn McCarney (1): regulators: Remove monitoring freq from comments Change-Id: I98e91ff9132b7317a9e2a2ebae2f72a3d9ea1b46 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 64ffe4c22..595f48a2e 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "e97fc13a6f3253327b60120bd56c571efa29c2d0" +SRCREV = "54b3ab9b3d89540fec3ef55001fc78133925ad98" -- cgit v1.2.3 From f3aff7b3dfdff254fdac222d29643e0bd46bd91d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 15:40:42 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 40a42aa5db..3a665b28dc Andrei Kartashev (2): Inventory.Item.Drive: add Capacity property Inventory.Item.Drive: add Protocol property Change-Id: I2e2c9e305427c7944511aa73023b599e5f0c4372 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 14e6a08fb..0f5f7ba2d 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "40a42aa5db808bf791135461e924259de0429f69" +SRCREV = "3a665b28dcc0d9f6926a1f5eb20bc0d9d768418d" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 8a7f9d48c6de51572959a251875a588841c3ab18 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 13:51:11 +0000 Subject: phosphor-led-manager: srcrev bump d870d68a21..e9fb5c6a17 George Liu (2): Handle D-Bus exceptions logging: switch to lg2 Lakshminarayana R. Kammath (1): Add lkammath as the Reviewer Change-Id: I53becf23f9e535e1ea47620057c991f96b148cb9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index f47d8c91b..aa67a670d 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "d870d68a21066c747b9d574507a9e5109bd35502" +SRCREV = "e9fb5c6a1728a2f8a6ec69f4150d527502fb5510" -- cgit v1.2.3 From aa1d8d4095c930ce65e6362d152b211f10f3d413 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 13:41:41 +0000 Subject: webui-vue: srcrev bump 4928206943..9f61234ab2 Sneha Patel (1): Location codes on Hardware status-Inventory and LEDs Change-Id: I922b969a22d1b42ca539c8b14a98f638816ae1ed Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 75dcddd10..a518ffdd6 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "4928206943a094beab60f2d91ee7e9c9174b6223" +SRCREV = "9f61234ab2e8beea6ebe1f2e9dc445cd3521a0e4" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 6b76ad3a597b8d6993b9aaabfd08a9e901e90204 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 04:41:20 +0000 Subject: pldm: srcrev bump a6678d7445..841ee3d56a Pavithra Barithaya (1): PLDM : Temporary fix in the pldmRepoChangeEvent Change-Id: Ie130c1bc3211a0d761bfcf45fa3a632811d5ecb5 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index f681cfe16..6b61cf410 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "a6678d74457e790922305b7de48d15554a0651e5" +SRCREV = "841ee3d56a23360eda55573459e73f670fc613df" -- cgit v1.2.3 From 26dbcdbd917e4f22fb400153da0d3e7255c8e646 Mon Sep 17 00:00:00 2001 From: Zev Weiss Date: Fri, 10 Sep 2021 18:22:41 -0500 Subject: dropbear: use OpenSSH's sftp-server OpenSSH recently switched their scp client to default to using the sftp protocol instead of the legacy scp protocol [0]. There's still an opt-in flag (-O) available to switch it back, but it'd be nicer to not require it, and avoid the (sometimes problematic, security-wise) escaping/interpretation quirks of the scp protocol. (This also allows using other file-transfer clients like sftp and sshfs.) We're already compiling dropbear with sftp support anyway, it's just missing the sftp-server binary. Tested: in an e3c246d4i build, this increased the squashfs image size by 48KiB, or about 0.25%. With it installed, an OpenSSH scp binary compiled from current upstream HEAD (commit b0ec59a708b4) could successfully transfer files to and from the BMC both with and without the '-O' flag. [0] https://lists.mindrot.org/pipermail/openssh-unix-dev/2021-September/039616.html Signed-off-by: Zev Weiss Change-Id: I533046cfc85f90307c188ad42ca5c2cedeadfab4 --- meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend index 731f2013d..5113c66bb 100644 --- a/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend +++ b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend @@ -6,3 +6,7 @@ SRC_URI += "file://dropbearkey.service \ file://localoptions.h \ file://dropbear.default \ " + +# pull in OpenSSH's /usr/libexec/sftp-server so we don't have to rely +# on the crufty old scp protocol for file transfer +RDEPENDS:${PN} += "openssh-sftp-server" -- cgit v1.2.3 From d5cea14bea968d361eea32efa51e26c43093504f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 9 Sep 2021 11:42:05 -0700 Subject: Add repo tests to main repository This commit adds the repo test scripts to the main openbmc repository to be used for verification of meta layers. It is intended to go in hand with https://gerrit.openbmc-project.xyz/c/openbmc/openbmc-build-scripts/+/46063 to allow testing meta layers at compile time for compliance. For the moment it is just a no-op test; In the future, more capabilities will be added. Signed-off-by: Ed Tanous Change-Id: I034c9cd60590907db73d759eb9d943e3e62e62ec --- meta-phosphor/scripts/run-repotest.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 meta-phosphor/scripts/run-repotest.sh (limited to 'meta-phosphor') diff --git a/meta-phosphor/scripts/run-repotest.sh b/meta-phosphor/scripts/run-repotest.sh new file mode 100755 index 000000000..0b2a34b6c --- /dev/null +++ b/meta-phosphor/scripts/run-repotest.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e +# + +echo "Repo test passed" -- cgit v1.2.3 From 7f8954e7a7576c28a6773be2f0e306551c0aa754 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 9 Sep 2021 11:46:43 -0700 Subject: Implement a test for patch compliance Per our documentation, patches outside of a couple specific directories aren't allowed. This commit implements a build-time check to see if any new patches have been added. Functionally, because there's several meta layers that have broken the rules already, it has to contain a check against the various patches that already exist in the tree. This list doesn't constitute a grandfather-ing in of those patches, but recognizes that we can't immediately back them out, and having the maintainers take care of them will take time. Of note, this patchset also ignores patches in any of the poky layers, as we can't define their policies, and allows patches in meta-phosphor, as a backdoor in case we need a trapdoor to this policy, and all the maintainers agree to it. This change was originally checked into openbmc-build-scripts, but was moved to support more users, and keeping this list up to date. All comments on the latest review from https://gerrit.openbmc-project.xyz/c/openbmc/openbmc-build-scripts/+/46064/2 have been addressed. Change-Id: I1c3e062278b4856cbfda910bdbf122e4b7539f89 Signed-off-by: Ed Tanous --- meta-phosphor/scripts/run-repotest.sh | 82 +++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'meta-phosphor') diff --git a/meta-phosphor/scripts/run-repotest.sh b/meta-phosphor/scripts/run-repotest.sh index 0b2a34b6c..88501b20f 100755 --- a/meta-phosphor/scripts/run-repotest.sh +++ b/meta-phosphor/scripts/run-repotest.sh @@ -1,4 +1,86 @@ #!/bin/bash -e # +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +obmc_dir=${script_dir}/../../ + +# openbmc doesn't control what upstream poky, or any of the other layers do, +# which do use patches as part of their upstreaming process. +# meta-phosphor is also included such that patches that the community agrees to +# hold onto will be allowed in that layer. + +patch_files_tmp=$(mktemp) +allowed_patches_tmp=$(mktemp) + +git -C "$obmc_dir" ls-files -- \ + '*.patch' \ + ':!:poky/**' \ + ':!:meta-security/**' \ + ':!:meta-xilinx/**' \ + ':!:meta-raspberrypi/**' \ + ':!:meta-openembedded/**' \ + ':!:meta-phosphor/**' \ + | sort > $patch_files_tmp + + +# The following patches were present on master at the time this test was +# written. Their presence in this list should not be acknowlegement that they +# are now allowed, but ignoring them is required in the intermediate time +# between when this test was created, and when the maintainers of these repos +# clean them up. +# +# https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md +echo "\ +meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch +meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch +meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch +meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch +meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch +meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0003-misc-aspeed-Add-Aspeed-UART-routing-control-driver.patch +meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch +meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch +meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch +meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch +meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch +meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch +meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch +meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch +meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch +meta-google/recipes-extended/libconfig/files/0001-makefile-Add-missing-LDFLAGS.patch +meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch +meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch +meta-nuvoton/recipes-bsp/images/npcm7xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0004-aspeed-add-bmc-position-support.patch +meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/0001-Add-NCSI-channel-selector.patch +meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control/0001-Stop-and-send-SRESET-for-one-thread-only.patch +meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Add-boot-initiator-mailbox-interface.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Add-support-for-persistent-only-settings.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-version-parsing-update-AUX-revision-info.patch +" | sort > $allowed_patches_tmp + + + +files_diff=$(comm -23 $patch_files_tmp $allowed_patches_tmp) +rm $allowed_patches_tmp +rm $patch_files_tmp + +files_count=$(echo -n "$files_diff" | grep -c '^') +if [[ $files_count -ne 0 ]]; then + echo "Patch files found not in allow list" + echo "$files_diff" + echo "Patches are not allowed on OpenBMC in these layers. Please upstream your changes and see \ + https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md" + exit 1 +fi + echo "Repo test passed" + -- cgit v1.2.3 From 8d9f584edf457fee9306e199afb51f6ebb35ced4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 09:11:16 +0000 Subject: ssifbridge: srcrev bump 22f04265eb..b62da09713 Dung Cao (1): Update to c++20 and meson >= 0.57.0 Change-Id: I168cd80da56ed25917bb44036f4b0cab7ea19490 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index 948ae6985..ad9780197 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -21,5 +21,5 @@ DEPENDS += "cli11" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" -SRCREV= "22f04265eb07c73ba33c488548b7f797cc1c2b30" +SRCREV= "b62da097135346b1027a057c675ffc679c6fe3f6" -- cgit v1.2.3 From 3871fbecb38ae266446b73c52b986607089de6a4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 11:50:59 +0000 Subject: phosphor-led-manager: srcrev bump e9fb5c6a17..6c4e0f2f76 Lakshminarayana R. Kammath (1): Led: Configs: Rainier: Update led names to reflect pca955x Change-Id: I93de5c212b460dee16a72eaa1099d91e934a4c94 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index aa67a670d..13ac75bec 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "e9fb5c6a1728a2f8a6ec69f4150d527502fb5510" +SRCREV = "6c4e0f2f767af5d5096d9f5462ba3af06b649e09" -- cgit v1.2.3 From a74bae614c6b56d7bacfe3f5d1e2a8a619dd46c8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 17:20:54 +0000 Subject: entity-manager: srcrev bump e7ac9c9eb1..93db9bf7c8 Lotus Xu (1): Add xdpe12284 support Change-Id: Ie647b365cf41a019812c08cd50dcdd1e243e7f6a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index e07140d11..716cb238c 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "e7ac9c9eb1d2e4b052d7f9b082ab4642eab304e9" +SRCREV = "93db9bf7c8c9d81d2f2f88dbc376c1fcb05a82e3" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 27ed9a21506eb37dc645921cf39b5a94fd5a5cec Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 18:21:44 +0000 Subject: x86-power-control: srcrev bump 50937e7339..1aa08b2364 Zev Weiss (1): Enable comments in config json Change-Id: Ifb2c84391dd0bac009a1f673288ee3e7f705af88 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 53de8c616..e9bad0698 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "50937e7339db744f765efdc3cc58f3d0c5976601" +SRCREV = "1aa08b23645a85c655fe4712fe7bbb81c7f46dfc" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From ef50c6af5d004b43308f350310e02c138fa9f533 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 18:01:30 +0000 Subject: phosphor-state-manager: srcrev bump 2bfb1efc4b..5f8e04a6e1 Andrew Geissler (6): lg2: convert bmc state manager bmc-reset: check host boot progress prior to reset bmc-reset: create error if host was running bmc-reset: ensure chassis power on target complete bmc-reset: move to quiesce if host was running bmc-reset: add service to launch new host recovery Add new service to install image Change-Id: I2b3aa0c8c80450295e7884ece74ad9729d3bd66e Signed-off-by: Andrew Geissler --- .../state/phosphor-state-manager-systemd-links.inc | 8 ++++++++ .../recipes-phosphor/state/phosphor-state-manager_git.bb | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index c692c6163..6cee30287 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -9,6 +9,11 @@ pkg_postinst:${PN}-obmc-targets:append() { TARGET="../phosphor-discover-system-state@.service" ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/phosphor-reset-host-recovery@0.service" + TARGET="../phosphor-reset-host-recovery@.service" + ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/obmc-host-startmin@0.target" TARGET="../obmc-host-startmin@.target" @@ -89,6 +94,9 @@ pkg_prerm:${PN}-obmc-targets:append() { LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-discover-system-state@0.service" rm $LINK + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/phosphor-reset-host-recovery@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/obmc-host-startmin@0.target" rm $LINK diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index befda3ff3..434e63550 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -83,6 +83,9 @@ SYSTEMD_SERVICE:${PN}-discover += "phosphor-discover-system-state@.service" FILES:${PN}-host-check = "${bindir}/phosphor-host-check" SYSTEMD_SERVICE:${PN}-host-check += "phosphor-reset-host-running@.service" +FILES:${PN}-host-check = "${bindir}/phosphor-host-reset-recovery" +SYSTEMD_SERVICE:${PN}-host-check += "phosphor-reset-host-recovery@.service" + SYSTEMD_SERVICE:${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" @@ -181,7 +184,8 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', ' SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" + SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "2bfb1efc4bc7e781224e19c05b51e6675f13a488" +SRCREV = "5f8e04a6e169121599b6e1e054900fffd1a42a39" S = "${WORKDIR}/git" -- cgit v1.2.3 From 666554ef1d4f602683259a0919ec5a7a384b9a92 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 22:31:07 +0000 Subject: phosphor-ipmi-flash: srcrev bump 203ad80448..b487eb47e5 Willy Tu (2): helper: Remove alignof for memcpyAligned() phosphor-ipmi-flash: Fix all C++ warnings Change-Id: I9b529a551836ca9cd0bdce5f797f472aad4c94df Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 07ad73f5a..65fb2489b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -48,7 +48,7 @@ EXTRA_OECONF:append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "203ad80448552bb291cbebb9fdce362d58acc5f4" +SRCREV = "b487eb47e566df7679e740559582f6d25597feba" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ -- cgit v1.2.3 From 864f7a212eca5431e6216f2f0a08849d03c3a6dc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 21:40:59 +0000 Subject: bmcweb: srcrev bump 7de9f811db..a3e65892ad Ed Tanous (2): Nullify HttpHeaders per the specification Make fewer copies Change-Id: I412974106a5e7098058a084fe9223df812bff23e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d5b95be14..728dfae4b 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "7de9f811db3400121e1453b1fa3da09ae6df69f6" +SRCREV = "a3e65892add97ce68816c1544c0aa21591239fc7" S = "${WORKDIR}/git" -- cgit v1.2.3 From 4734c22edc654522fad23b82a66a140b46a29266 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 20 Sep 2021 11:11:34 -0700 Subject: Ignore grep failures When the last round of reviews added -e to the bash statement, it exposed a slight flaw, in that when there aren't failures, grep will return a code if it's not able to find any matches. This commit changes that such that grep errors are "ignored" in the context of bash. Tested: ran run-repotest.sh on a clean repository, and observed "repo test passed" Signed-off-by: Ed Tanous Change-Id: I716220652d48b9a8489bf4dc0c3b4734b98a70e4 --- meta-phosphor/scripts/run-repotest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/scripts/run-repotest.sh b/meta-phosphor/scripts/run-repotest.sh index 88501b20f..bd82176d3 100755 --- a/meta-phosphor/scripts/run-repotest.sh +++ b/meta-phosphor/scripts/run-repotest.sh @@ -73,7 +73,7 @@ files_diff=$(comm -23 $patch_files_tmp $allowed_patches_tmp) rm $allowed_patches_tmp rm $patch_files_tmp -files_count=$(echo -n "$files_diff" | grep -c '^') +files_count=$(echo -n "$files_diff" | grep -c '^' || true) if [[ $files_count -ne 0 ]]; then echo "Patch files found not in allow list" echo "$files_diff" -- cgit v1.2.3 From c9e777122ba744f97fc84385b31a481ed25aad69 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Sep 2021 05:41:06 +0000 Subject: phosphor-led-sysfs: srcrev bump 5ee5f3b716..520c5e51fd George Liu (1): Update clang-format Change-Id: I934778112bc88b6d0c144631efd233294706dec8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index e1f7f259f..03f7a6d8c 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -20,7 +20,7 @@ EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" -SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" +SRCREV = "520c5e51fd5df42e930c14ccf7dcc3c44d829a87" S = "${WORKDIR}/git" do_install:append() { -- cgit v1.2.3 From c7dbe3888e52e34b986288a211862c1e51e7540c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Sep 2021 15:00:44 +0000 Subject: phosphor-pid-control: srcrev bump f7575a7001..e7507a8b55 Patrick Williams (1): exception: switch to public sdbus exception Paul Fertser (1): configure.md: add stepwise documentation Change-Id: I48bd89f91cc2fd88d14e9d1ccb40aceadc12fc5f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index ec0bcb484..01f3586fa 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "f7575a70018c09962500da8f4ba6883253651f62" +SRCREV = "e7507a8b55136accc501408d691bd816abc4833f" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From f6ca982e2634604a90887673cd90b9f8d448f44e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Sep 2021 15:51:05 +0000 Subject: phosphor-logging: srcrev bump 87001e465f..8034ddebe4 Andrew Geissler (1): PEL:message_registry: add new HostNotRunning error Change-Id: I4b2415e92de1e707086af0388dc29a96a8d541db 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') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c59ca945c..279eb46bb 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 = "87001e465fc420d3eedb3630bc162ed714a7809e" +SRCREV = "8034ddebe40b7dea16491de9bdb436f2ca72cf0e" S = "${WORKDIR}/git" -- cgit v1.2.3 From b1625d1a42517d4313da435aec075055d694e195 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Sep 2021 18:21:12 +0000 Subject: dbus-sensors: srcrev bump 0c42f40e55..20bf2c1c12 Matt Spinler (1): HwmonTempSensor: Watch for InterfacesRemoved Change-Id: Ie4b7734ad2abd4c98d390e46f960c42f582cbd3d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index d5df353fc..966241c7b 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "0c42f40e55fd4fe6274962ea17e804f49f5de19e" +SRCREV = "20bf2c1c1240f50f746321005b34ee36039d993b" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From e35e86979b1e91eb780984d2d7b63eab9089deab Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Sep 2021 20:30:46 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump f2cc64c666..3ea1e870cb selvaganapathim (1): Image_manager:Remove temporary untar image dir Change-Id: Iba82adfb4b09a251e1b4a5cad01ce98cef79caa1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 3d9155998..c748e6a84 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "f2cc64c666899b43e559be3167ed561989dbfc34" +SRCREV = "3ea1e870cb2205633d74c32d2b520e71e68be501" -- cgit v1.2.3 From feb4472ce9469492a150a7f6fcfa363b47201726 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Sep 2021 16:00:43 +0000 Subject: phosphor-dbus-monitor: srcrev bump b839c3ea01..cfdfa0da24 Patrick Williams (1): pdmgen: workaround restriction in sdbus++ NamedElement Change-Id: I3f8a0b17e08b39bfd9f46f2a1618afaf7bb262cb Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index 8cc9c089f..d4176b70a 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "b839c3ea01044e38b7beb37e8920ccc31f3c6519" +SRCREV = "cfdfa0da249777b7aad9dacf4e4e3198d8309da5" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From c41b190cbad658242d54a7af3c56e9c5c9ca2a67 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Sep 2021 20:40:32 +0000 Subject: sdbusplus: srcrev bump ef26221bc1..dfb5642201 Patrick Williams (1): sdbus++: catch elements with non-string names Change-Id: Ic62756f583d4898a33f2336fb369e7b57f065a85 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 0e94eecd0..c2d045c97 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "ef26221bc1cd54c93b8d6eacc20fa2f090cb15cb" +SRCREV = "dfb5642201699dc42a7dda12d72718a8b9568151" -- cgit v1.2.3 From 1467cd8872d1977b6a9a4bfb0c2dff9572a1d2df Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Wed, 22 Sep 2021 15:15:31 +0800 Subject: openssh: Don't create openssh-dev populate_sdk installs all -dev packages, so having openssh-dev pulls in openssh-sshd in as a dependency. That then conflicts with Dropbear, which is only using openssh-sftp. The openssh-dev package is empty and unused, created by bitbake.conf Fixes https://github.com/openbmc/openbmc/issues/3819 related to 26dbcdb dropbear: use OpenSSH's sftp-server Signed-off-by: Matt Johnston Change-Id: Ifce8207a5cd46c6d18d0eb82f3c7a9720616dd20 --- meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend b/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend new file mode 100644 index 000000000..72d59f6a7 --- /dev/null +++ b/meta-phosphor/recipes-connectivity/openssh/openssh_%.bbappend @@ -0,0 +1,4 @@ +# Don't create an empty openssh-dev package. That would pull in openssh-sshd +# even it we are only depending on openssh-sftp, which causes conflicts +# with dropbear +ALLOW_EMPTY:${PN}-dev = "0" -- cgit v1.2.3 From 73ed0819a2afd90206033eb7a369bfc10386aec7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 09:01:21 +0000 Subject: pldm: srcrev bump 841ee3d56a..be06bc920c Manojkiran Eda (1): Fix json files Sagar Srinivas (3): PLDM: implement surveillance between Host and bmc oem_ibm: Reset Watchdog Timer oem_ibm: Disable Watchdog Timer Sridevi Ramesh (3): PDR: Add effecter support for fault LEDS. Update dimm & pcieslot entity info for sensor LEDs. Update CPU entity info for sensor LEDs Change-Id: Ibd79c4ea66c761754ff6d86969e3add3b5f78567 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 6b61cf410..40b959a75 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "841ee3d56a23360eda55573459e73f670fc613df" +SRCREV = "be06bc920c007254d5ffd52adb9d2ba4a111c20e" -- cgit v1.2.3 From b4d1cba25c7a6564ea7789007c2675f738d571a6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Sep 2021 18:31:17 +0000 Subject: x86-power-control: srcrev bump 1aa08b2364..61b4a5bf7e Jason M. Bills (1): Start the watchdog each time waitForSIOPowerGood is set Jean-Marie Verdun (2): Fix gpio logic following parity code insertion SioPowerGoodAssert check at boot for HPE Proliant Change-Id: Ie9dcb53cd9249bc5657adc4b4a73da0bf29ed5af Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index e9bad0698..102b3fcb8 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "1aa08b23645a85c655fe4712fe7bbb81c7f46dfc" +SRCREV = "61b4a5bf7e8e7be92807fcb85a9780075e8893b4" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From 89044b1bec79b912598c1482c4e2f9cb88487ba3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Sep 2021 19:41:21 +0000 Subject: webui-vue: srcrev bump 9f61234ab2..c9cb8d433b Grzegorz Raguza (1): Change filtering virtual media Change-Id: I97501cbf54261a19f6c58021dee5f98d78da28bd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a518ffdd6..a221ca715 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "9f61234ab2e8beea6ebe1f2e9dc445cd3521a0e4" +SRCREV = "c9cb8d433b7ed5f4d37cd8d946c2593d4d886ce1" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 8e564737fc0626de1f30882b129d7eb57338f05e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 02:01:27 +0000 Subject: dbus-sensors: srcrev bump 20bf2c1c12..33703af797 Lotus Xu (1): psusensor: Add xdpe12284 support Change-Id: I55dff5ce8e43ac7e279c1c231dc9758504fac9d2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 966241c7b..61ddf5777 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "20bf2c1c1240f50f746321005b34ee36039d993b" +SRCREV = "33703af797949b47375086988daeac89b47b5db1" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From d451c1b263d1301b0712351f13d038d1bb966863 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 17:40:51 +0000 Subject: bmcweb: srcrev bump a3e65892ad..c0bd5e4b37 Ali Ahmed (1): Move TPMRequiredToBoot under Boot for PATCH call Ed Tanous (2): Disable nlohmann exceptions Move log service file parsing to use from_chars Change-Id: I53e5935819047b17865cc314d2c49013c92c2d6c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 728dfae4b..46e4ed42c 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "a3e65892add97ce68816c1544c0aa21591239fc7" +SRCREV = "c0bd5e4b37f65ce29a392594d1ef240c64c99734" S = "${WORKDIR}/git" -- cgit v1.2.3 From 09e5d44985aca8e4cefae72be9b22a17584db658 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 22:41:11 +0000 Subject: phosphor-power: srcrev bump 54b3ab9b3d..4c88a4c2c0 Shawn McCarney (1): regulators: Make inventory_path required property Change-Id: I789458e2b08bf19fdf74f81e131a35f3ee6dda76 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 595f48a2e..4f502d36e 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "54b3ab9b3d89540fec3ef55001fc78133925ad98" +SRCREV = "4c88a4c2c0420735b737c8641c51b34d1cfbb0c3" -- cgit v1.2.3 From 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 Mon Sep 17 00:00:00 2001 From: Mike Capps Date: Thu, 23 Sep 2021 14:05:04 -0400 Subject: Control - add CLI11 dependency to recipe compile-time dependency needed by fanctl Signed-off-by: Mike Capps Change-Id: Ic58a83ce3c85fe4ba75fc348628e6c0fac5fb870 --- meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-phosphor') diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 0cf6a5968..4a7dd48da 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -23,6 +23,7 @@ DEPENDS += "gpioplus" DEPENDS += "phosphor-logging" DEPENDS += "libevdev" DEPENDS += "nlohmann-json" +DEPENDS += "cli11" # Package configuration FAN_PACKAGES = " \ -- cgit v1.2.3