From 235618c7396902842906bc3a8c90a3320aeeaeba Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 7 Apr 2020 15:43:15 -0700 Subject: Update to internal 0.47 Signed-off-by: Jason M. Bills --- .../meta-common/recipes-phosphor/ipmi/ipmitool_%.bbappend | 6 ------ .../meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/ipmitool_%.bbappend (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/ipmitool_%.bbappend deleted file mode 100644 index 84e250b66..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ - -# Disable the shell to remove the usage of readline lib -# to fix the license conflict issue. More information: -# https://lists.ozlabs.org/pipermail/openbmc/2019-November/019678.html - -EXTRA_OECONF_append = " --disable-ipmishell" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index fc724eb33..d7cec2d76 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,8 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" -SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "3165569a562983cf3c43b0b10c23e7695a031b56" +# TODO: latest is breaking sensor list, needs triage before unpin +SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid;nobranch=1" +SRCREV = "e7e8b8166a1c0e352ee6e0e1daa76abbff228ed6" SRC_URI += "file://phosphor-ipmi-host.service \ file://0010-fix-get-system-GUID-ipmi-command.patch \ -- cgit v1.2.3