diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-facebook/recipes-fb | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-facebook/recipes-fb')
3 files changed, 30 insertions, 30 deletions
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb index 1f476adee..ee7202164 100644 --- a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb +++ b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" inherit obmc-phosphor-systemd LICENSE = "Apache-2.0" @@ -14,10 +14,10 @@ SRC_URI = "file://setup_gpio.sh \ file://LICENSE" DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service" +SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service" do_install() { install -d ${D}/usr/sbin diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 28586a989..ceade37d2 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "58c1ca2f7cc58eacc059486bacb66d152de0631c" +SRCREV = "485f9b31cbdc8e8aebdfb18729f541f41227522d" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" @@ -15,25 +15,25 @@ DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd " inherit cmake obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" -EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1" +EXTRA_OECMAKE:append:yosemitev2 = " -DBIC=1" -EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" +EXTRA_OECMAKE:append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" LIBRARY_NAMES = "libzfboemcmds.so" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -FILES_${PN}_append = " ${datadir}/lcd-debug/post_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/gpio_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/cri_sensors.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/post_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/gpio_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/cri_sensors.json" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" -do_install_append(){ +do_install:append(){ install -d ${D}${includedir}/fb-ipmi-oem install -m 0644 -D ${S}/include/*.hpp ${D}${includedir}/fb-ipmi-oem } diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 6b61bba5a..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -10,7 +10,7 @@ PACKAGES = " \ ${PN}-flash \ ${PN}-system \ " -PACKAGES_append_fb-withhost = " \ +PACKAGES:append:fb-withhost = " \ ${PN}-chassis \ ${PN}-hostmgmt \ " @@ -20,31 +20,31 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "Facebook Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Facebook Chassis" +RDEPENDS:${PN}-chassis = " \ x86-power-control \ " -SUMMARY_${PN}-extras_tiogapass = "Extra features for tiogapass" -RDEPENDS_${PN}-extras_tiogapass = "phosphor-nvme" +SUMMARY:${PN}-extras:tiogapass = "Extra features for tiogapass" +RDEPENDS:${PN}-extras:tiogapass = "phosphor-nvme" -SUMMARY_${PN}-fans = "Facebook Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "Facebook Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-flash = "Facebook Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Facebook Flash" +RDEPENDS:${PN}-flash = " \ phosphor-software-manager \ " RDEPENDS_PN_SYSTEM_EXTRAS = "" -RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ +RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ fb-powerctrl \ phosphor-ipmi-ipmb \ fb-ipmi-oem \ @@ -55,8 +55,8 @@ RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ phosphor-host-postd \ " -SUMMARY_${PN}-system = "Facebook System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Facebook System" +RDEPENDS:${PN}-system = " \ entity-manager \ dbus-sensors \ phosphor-virtual-sensor \ |