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-phosphor/recipes-phosphor/interfaces | |
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-phosphor/recipes-phosphor/interfaces')
3 files changed, 9 insertions, 9 deletions
diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3db77d998..f7d2413ef 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -4,8 +4,8 @@ inherit useradd USERADD_PACKAGES = "${PN}" # add a user called httpd for the server to assume -USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin bmcweb" -GROUPADD_PARAM_${PN} = "web; redfish" +USERADD_PARAM:${PN} = "-r -s /usr/sbin/nologin bmcweb" +GROUPADD_PARAM:${PN} = "web; redfish" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" @@ -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 = "ff3f835ad47f7a4f61d5fe9345dccdd3e496c47c" +SRCREV = "7bb985eeb0930905c2f4d551e895dd5293094931" S = "${WORKDIR}/git" @@ -37,7 +37,7 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ jsnbd \ phosphor-mapper \ " @@ -47,7 +47,7 @@ do_install_ptest() { cp -rf ${B}/*_test ${D}${PTEST_PATH}/test/ } -FILES_${PN} += "${datadir}/** " +FILES:${PN} += "${datadir}/** " EXTRA_OEMESON = " \ @@ -56,6 +56,6 @@ EXTRA_OEMESON = " \ -Dyocto-deps=enabled \ " -SYSTEMD_SERVICE_${PN} += "bmcweb.service bmcweb.socket" +SYSTEMD_SERVICE:${PN} += "bmcweb.service bmcweb.socket" FULL_OPTIMIZATION = "-Os " diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 8db94b0c3..92f2342c8 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -10,7 +10,7 @@ inherit allarch inherit obmc-phosphor-systemd inherit setuptools3 -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-netserver \ python-json \ python-dbus \ @@ -18,7 +18,7 @@ RDEPENDS_${PN} += " \ pyphosphor-dbus \ " -SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket" +SYSTEMD_SERVICE:${PN} += "rest-dbus.service rest-dbus.socket" SRC_URI += "git://github.com/openbmc/rest-dbus.git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb index 0022d9243..6eaed0fe1 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig inherit obmc-phosphor-systemd -SYSTEMD_SERVICE_${PN} += "slpd-lite.service" +SYSTEMD_SERVICE:${PN} += "slpd-lite.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" |