diff options
Diffstat (limited to 'meta-intel/meta-common')
5 files changed, 3 insertions, 8 deletions
diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 4d0d20476..45ff9b395 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "7086a88cfe94db15233bae450b3a03d3566bca68" +SRCREV = "2a265d54ac0b3f0f64243195fa8f299fff3dd7e4" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend deleted file mode 100644 index 54dc73d75..000000000 --- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -RDEPENDS_${PN}-extras_remove = " \ - phosphor-rest \ - phosphor-gevent \ - " diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service index f4ffa17a0..99494717f 100644 --- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service +++ b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service @@ -3,7 +3,7 @@ Description=Phosphor-Pid-Control Margin-based Fan Control Daemon [Service] Restart=always -ExecStart={sbindir}/swampd +ExecStart={bindir}/swampd RestartSec=5 StartLimitInterval=0 Type=simple diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 6ad9a434c..e5f63fbda 100644 --- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,5 @@ do_install_append(){ install -d ${D}${includedir}/phosphor-ipmi-host - install -m 0644 -D ${S}/utils.hpp ${D}${includedir}/phosphor-ipmi-host - install -m 0644 -D ${S}/types.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host } diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json index 1543a6249..15dfaa66c 100644 --- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json @@ -1,4 +1,5 @@ { + "redfishSupportEnabled" : true, "customKeyEnable": true, "keyType" : "VT100+", "customConsoleDisplaySize": { |