summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-intel
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-09-28 22:04:51 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-09-28 23:07:19 +0300
commitffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (patch)
tree8019999b0ca042482e5193d6cabc06220c71d776 /meta-openbmc-mods/meta-common/recipes-intel
parentd73e39703a0260c8911cb439b579e1c2bada4b20 (diff)
downloadopenbmc-ffe6d597d9e3d4407cf8062b5d6505a80ce08f41.tar.xz
Update to internal 0.75
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-intel')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/configure-usb-c/configure-usb-c.bb8
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb2
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb2
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb2
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/nic/enable-nics.bb6
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb25
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend10
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb2
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb4
-rw-r--r--meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb6
10 files changed, 36 insertions, 31 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/configure-usb-c/configure-usb-c.bb b/meta-openbmc-mods/meta-common/recipes-intel/configure-usb-c/configure-usb-c.bb
index 66481543b..e46b96115 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/configure-usb-c/configure-usb-c.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/configure-usb-c/configure-usb-c.bb
@@ -9,17 +9,17 @@ SRC_URI = " \
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
inherit systemd
-FILES_${PN} += "${systemd_system_unitdir}/configure-usb-c.service"
+FILES:${PN} += "${systemd_system_unitdir}/configure-usb-c.service"
-do_install_append() {
+do_install:append() {
install -d ${D}${bindir}
install -m 0755 ${S}/configure-usb-c.sh ${D}/${bindir}/configure-usb-c.sh
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${S}/configure-usb-c.service ${D}${base_libdir}/systemd/system
}
-SYSTEMD_SERVICE_${PN} = "configure-usb-c.service"
+SYSTEMD_SERVICE:${PN} = "configure-usb-c.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb
index dff0d2a23..2bd500677 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb
@@ -14,6 +14,6 @@ SRC_URI = "git://github.com/Intel-BMC/host-misc-comm-manager.git;protocol=ssh"
SRCREV = "da65b239e6622fbf913a904480fe3ff87ee02dec"
inherit cmake systemd
-SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Host.Misc.Manager.service"
+SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Host.Misc.Manager.service"
DEPENDS = "boost sdbusplus phosphor-logging"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
index 93de696d2..7c7c483c2 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
@@ -8,7 +8,7 @@ PV = "0.1+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-SYSTEMD_SERVICE_${PN} = "hsbp-manager.service"
+SYSTEMD_SERVICE:${PN} = "hsbp-manager.service"
DEPENDS = "boost \
i2c-tools \
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb
index 95ecf30fc..51c5fdf74 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb
@@ -14,7 +14,7 @@ SRCREV = "966d16f680c1b14c338640d35a12d5e2f9a6937a"
S = "${WORKDIR}/git"
-do_install_append() {
+do_install:append() {
install -d ${D}/${bindir}
install -m 775 ${B}/blocksign ${D}/${bindir}
}
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/nic/enable-nics.bb b/meta-openbmc-mods/meta-common/recipes-intel/nic/enable-nics.bb
index 50c8bd63e..4d5102386 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/nic/enable-nics.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/nic/enable-nics.bb
@@ -8,11 +8,11 @@ SRC_URI = "file://enable-nics.sh \
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
inherit systemd
-FILES_${PN} += "${systemd_system_unitdir}/enable-nics.service"
+FILES:${PN} += "${systemd_system_unitdir}/enable-nics.service"
do_install() {
install -d ${D}${systemd_system_unitdir}
@@ -21,4 +21,4 @@ do_install() {
install -m 0755 ${S}/enable-nics.sh ${D}/${bindir}/enable-nics.sh
}
-SYSTEMD_SERVICE_${PN} += " enable-nics.service"
+SYSTEMD_SERVICE:${PN} += " enable-nics.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
index 4d91ac673..edee2c70b 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
@@ -19,20 +19,25 @@ 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 = "Intel Chassis"
-RDEPENDS_${PN}-chassis = " \
+SUMMARY:${PN}-chassis = "Intel Chassis"
+RDEPENDS:${PN}-chassis = " \
x86-power-control \
"
-SUMMARY_${PN}-fans = "Intel Fans"
-RDEPENDS_${PN}-fans = " \
+SUMMARY:${PN}-fans = "Intel Fans"
+RDEPENDS:${PN}-fans = " \
phosphor-pid-control \
"
-SUMMARY_${PN}-flash = "Intel Flash"
-RDEPENDS_${PN}-flash = ""
+SUMMARY:${PN}-flash = "Intel Flash"
+RDEPENDS:${PN}-flash = ""
+
+SUMMARY:${PN}-system = "Intel System"
+RDEPENDS:${PN}-system = " \
+ webui-vue \
+ "
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
index 7d61ea5c7..e3fccea14 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,7 +1,7 @@
-RDEPENDS_${PN}-extrasdevtools = "libgpiod-tools"
-RDEPENDS_${PN}-chassis-state-mgmt_remove = "obmc-phosphor-power"
-RDEPENDS_${PN}-devtools_remove = "ffdc"
+RDEPENDS:${PN}-extrasdevtools = "libgpiod-tools"
+RDEPENDS:${PN}-chassis-state-mgmt:remove = "obmc-phosphor-power"
+RDEPENDS:${PN}-devtools:remove = "ffdc"
-PACKAGES_remove = "${PN}-debug-collector"
+PACKAGES:remove = "${PN}-debug-collector"
-RDEPENDS_${PN}-settings = "settings"
+RDEPENDS:${PN}-settings = "settings"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb
index ab41db601..d957147de 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit cmake
inherit systemd
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.coldredundancy.service"
+SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.coldredundancy.service"
DEPENDS += " \
systemd \
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
index 34352acef..9eca05bae 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit cmake pkgconfig
inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} += "smbios-mdrv1.service"
+SYSTEMD_SERVICE:${PN} += "smbios-mdrv1.service"
DEPENDS += " \
autoconf-archive-native \
@@ -23,7 +23,7 @@ DEPENDS += " \
phosphor-dbus-interfaces \
phosphor-logging \
"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
libsystemd \
sdbusplus \
phosphor-dbus-interfaces \
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
index b96ded9a4..e40148a91 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
@@ -2,7 +2,7 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform"
DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom"
SRC_URI = "git://github.com/openbmc/smbios-mdr.git"
-SRCREV = "a427dd1de9e765861a52ce0f73021a282cc6ce4c"
+SRCREV = "ecbd71baa68d0c2834614d84f24de7d369a51ce4"
S = "${WORKDIR}/git"
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit cmake pkgconfig
inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} += "smbios-mdrv2.service"
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.cpuinfo.service"
+SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service"
+SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.cpuinfo.service"
DEPENDS += " \
autoconf-archive-native \