diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 00:15:49 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 00:15:49 +0300 |
commit | f24c1e9afc47a421831278b57377951e71494d92 (patch) | |
tree | f01c5b14beb4bf31905f769569ed647884491cea /meta-intel | |
parent | 057594a8bb8d062d72244196170c2d78947d318a (diff) | |
parent | 31e5d79893f21786cb0635ab3640d50ff6202f6a (diff) | |
download | openbmc-f24c1e9afc47a421831278b57377951e71494d92.tar.xz |
Merge tag 'wht-0.66' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-intel')
14 files changed, 95 insertions, 57 deletions
diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index c753477a8..4ae19c75b 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "warrior zeus" +LAYERSERIES_COMPAT_intel = "dunfell" LAYERDEPENDS_intel = "phosphor-layer" diff --git a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index 4a2353f8b..2402316e1 100644 --- a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -13,10 +13,3 @@ S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.HostErrorMonitor.service" SECURITY_CFLAGS_pn-host-error-monitor = "${SECURITY_NOPIE_CFLAGS}" - -# linux-libc-headers guides this way to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb index ed1c7b508..f62dcdce2 100644 --- a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb +++ b/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb @@ -8,13 +8,6 @@ inherit cmake SRC_URI = "git://github.com/openbmc/libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "7ef5a55777bb4d0c403a4eca98c487fa4e9c7bd1" +SRCREV = "a2ceec2aa139277cebb62e1eda449ef60fa4c962" S = "${WORKDIR}/git" - -# linux-libc-headers guides this way to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-intel/meta-common/recipes-core/service-config-manager/service-config-manager_git.bb b/meta-intel/meta-common/recipes-core/service-config-manager/service-config-manager_git.bb new file mode 100644 index 000000000..10e38be0b --- /dev/null +++ b/meta-intel/meta-common/recipes-core/service-config-manager/service-config-manager_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "Service configuration manager daemon to control service properties" +DESCRIPTION = "Daemon controls service properies like port, channels, state etc.." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" +inherit cmake systemd + +SRC_URI = "git://github.com/openbmc/service-config-manager" + +PV = "0.1+git${SRCPV}" +SRCREV = "ee853eb2d865c7da9eec99cdcac04f8aee750e49" + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service" + +DEPENDS += " \ + systemd \ + sdbusplus \ + sdbusplus-native \ + phosphor-logging \ + boost \ + " +RDEPENDS_${PN} += " \ + libsystemd \ + sdbusplus \ + phosphor-logging \ + " diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service index fdeefd417..8f3a2bc31 100644 --- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service @@ -1,9 +1,9 @@ [Unit] -Description=Rotates the event logs +Description=Rotate the event logs [Service] -Type=oneshot -ExecStart=/usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog +Type=simple +ExecStart=/usr/bin/rotate-event-logs.sh [Install] WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh new file mode 100644 index 000000000..5a8c5cc10 --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +while true; do + sleep 60 + /usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog + ec=$? + if [ $ec -ne 0 ] ; then + echo "logrotate failed ($ec)" + fi +done diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer deleted file mode 100644 index ae1185e4f..000000000 --- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run rotate-event-logs.service every minute - -[Timer] -OnActiveSec=60 -OnUnitActiveSec=60 - -[Install] -WantedBy=timers.target diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend index 7e282804e..c42693787 100644 --- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ file://rotate-event-logs.service \ - file://rotate-event-logs.timer \ + file://rotate-event-logs.sh \ file://rsyslog-override.conf \ " @@ -13,11 +13,12 @@ PACKAGECONFIG_append = " imjournal" do_install_append() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}/rsyslog.service.d install -m 0644 ${WORKDIR}/rsyslog-override.conf \ ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/rotate-event-logs.sh ${D}/${bindir}/rotate-event-logs.sh rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" +SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service" diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb deleted file mode 100755 index 7dd149e81..000000000 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -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 = "fc1ecc59100d21c953501703bc5db9e02e25b333" - -PV = "1.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit cmake systemd - -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service" - -DEPENDS += " \ - boost \ - i2c-tools \ - libgpiod \ - sdbusplus \ - phosphor-logging \ - " 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 ef3cec5a4..1ea442f21 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 = "899bfd15e7230b5da0b2b16c814f4e3bdf6c824c" +SRCREV = "fcd2d3a943c4fb518d399d8a0addd1cc661e5628" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb new file mode 100644 index 000000000..45e288dc0 --- /dev/null +++ b/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "PFR Manager Service" +DESCRIPTION = "Daemon to handle all PFR functionalities" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" +inherit cmake systemd + +SRC_URI = "git://github.com/openbmc/pfr-manager" + +PV = "0.1+git${SRCPV}" +SRCREV = "67d184ce46b59d413302b95f1a06cfed342c4bc8" + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.PFR.Manager.service" + +DEPENDS += " \ + sdbusplus \ + phosphor-logging \ + boost \ + i2c-tools \ + " diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json new file mode 100644 index 000000000..cf5a28303 --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json @@ -0,0 +1,16 @@ +{ + "channels": [ + { + "type": "me", + "slave-path": "/dev/ipmb-5", + "bmc-addr": 32, + "remote-addr": 44 + }, + { + "type": "ipmb", + "slave-path": "/dev/ipmb-13", + "bmc-addr": 32, + "remote-addr": 56 + } + ] +} diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend new file mode 100644 index 000000000..e8cbbe928 --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append = " file://ipmb-channels.json" + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ + ${D}/usr/share/ipmbbridge +} diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel/meta-s2600wf/conf/layer.conf index 13dfe21f2..2bb80b2f9 100644 --- a/meta-intel/meta-s2600wf/conf/layer.conf +++ b/meta-intel/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "warrior zeus" +LAYERSERIES_COMPAT_s2600wf = "dunfell" |