Run oe-stylize on our files
In all of our recipes, we should be following yoctos lead on formatting,
order, and other things, for consistency in our meta layers.
This commit runs oe-stylize.py on all of our files. The types of
changes being made can be seen in the commit, but amount to:
1. Setting an explicit key ordering
2. Sectioning the files appropriately
3. Applying rules checking to our files
At some point in the near future, we would turn this on as part of
repotest, but some minor changes need to be upstreamed to meta-oe (WIP)
to make that happen.
Looking for input on whether this is something we'd like to do, and
whether the diffs below look reasonable to folks.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I489dd21d38a9fe4f3ece89cc7a5e1d0463224abf
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
index 968c966..29d5b4b 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
@@ -1,16 +1,16 @@
-HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool"
SUMMARY = "Library and Host-side tool for talking to OpenBMC IPMI BLOB handlers."
DESCRIPTION = "This package provides a library for the BMC and host for core blob mechanics and host-side binaries for talking to OpenBMC IPMI BLOB handlers."
-PR = "r1"
-PV = "0.1+git${SRCPV}"
+HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+SRCREV = "ee975086169fce82413c27fefb871b779ea6b657"
+PV = "0.1+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/ipmi-blob-tool;branch=master;protocol=https"
+
+S = "${WORKDIR}/git"
inherit meson pkgconfig
EXTRA_OEMESON = "-Dtests=disabled"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/ipmi-blob-tool;branch=master;protocol=https"
-SRCREV = "ee975086169fce82413c27fefb871b779ea6b657"
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
index 7ede354..f7b0a47 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
@@ -1,10 +1,10 @@
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
DEPENDS += "systemd"
+SRCREV = "c3939dac2c060651361fc71516806f9ab8c38901"
+PV = "1.8.18+git${SRCPV}"
SRC_URI = "git://github.com/ipmitool/ipmitool.git;protocol=https;branch=master"
-SRCREV = "c3939dac2c060651361fc71516806f9ab8c38901"
-
# TODO: when a new company joins the OpenBMC project by signing
# a CLA, if they have an enterprise number on file with the
# IANA, the versioned file, $PWD/ipmitool/enterprise-numbers
@@ -18,8 +18,10 @@
file://enterprise-numbers \
"
-# make sure that the enterprise-numbers file gets installed in the root FS
-FILES:${PN} += "/usr/share/misc/enterprise-numbers"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus "
+
do_compile:prepend() {
# copy the SRC_URI version of enterprise-numbers
# to the build dir to prevent a fetch
@@ -27,9 +29,5 @@
cp "${WORKDIR}/enterprise-numbers" "${WORKDIR}/build/enterprise-numbers"
}
-S = "${WORKDIR}/git"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184"
-
-EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus "
-
-PV = "1.8.18+git${SRCPV}"
+# make sure that the enterprise-numbers file gets installed in the root FS
+FILES:${PN} += "/usr/share/misc/enterprise-numbers"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
index a4a456a..01b1794 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
@@ -1,30 +1,28 @@
-HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore"
SUMMARY = "BMC Generic Binary Blob Store via OEM IPMI Blob Transport"
DESCRIPTION = "This package provides a read/write/serialize abstraction for storing binary data through IPMI blobs"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
+HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-inherit meson pkgconfig
-
DEPENDS += "autoconf-archive-native"
DEPENDS += "phosphor-ipmi-blobs"
DEPENDS += "phosphor-logging"
DEPENDS += "protobuf-native"
DEPENDS += "protobuf"
-
+SRCREV = "62872f5cb38e755a5325a7f4875a053bd357ef1a"
PACKAGECONFIG ??= ""
PACKAGECONFIG[blobtool] = "-Dblobtool=enabled,-Dblobtool=disabled"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore;branch=master;protocol=https"
S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore;branch=master;protocol=https"
-SRCREV = "62872f5cb38e755a5325a7f4875a053bd357ef1a"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON:append = " -Dtests=disabled"
FILES:${PN}:append = " ${libdir}/ipmid-providers"
FILES:${PN}:append = " ${libdir}/blob-ipmid"
BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so"
-
-EXTRA_OEMESON:append = " -Dtests=disabled"
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
index 9e938ec..fea06cf 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
@@ -1,26 +1,26 @@
-HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs"
SUMMARY = "Phosphor OEM IPMI BLOBS Protocol Implementation"
DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the BLOB protocol for sending and receiving data over IPMI."
-PR = "r1"
-PV = "0.1+git${SRCPV}"
+HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-inherit meson pkgconfig
-
DEPENDS += " \
ipmi-blob-tool \
phosphor-ipmi-host \
phosphor-logging \
"
+SRCREV = "83f9992cc60dedb6a2a964a733fd35c89c8a0cfa"
+PV = "0.1+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs;branch=master;protocol=https"
S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs;branch=master;protocol=https"
-SRCREV = "83f9992cc60dedb6a2a964a733fd35c89c8a0cfa"
-FILES:${PN} += "${libdir}/ipmid-providers"
+inherit meson pkgconfig
EXTRA_OEMESON:append = " \
-Dtests=disabled \
-Dexamples=false \
"
+
+FILES:${PN} += "${libdir}/ipmid-providers"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
index 8d62b59..9f69a59 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
@@ -1,22 +1,23 @@
SUMMARY = "Phosphor OpenBMC BT to DBUS"
DESCRIPTION = "Phosphor OpenBMC BT to DBUS."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "systemd"
+PROVIDES += "virtual/obmc-host-ipmi-hw"
+SRCREV = "a6ec899618a28a30f7907a6cc90fe027047297d1"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "git://github.com/openbmc/btbridge;branch=master;protocol=https"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
inherit obmc-phosphor-dbus-service
-DBUS_SERVICE:${PN} = "org.openbmc.HostIpmi.service"
-
-PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
RRECOMMENDS:${PN} += "phosphor-ipmi-host"
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "systemd"
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
-S = "${WORKDIR}/git"
-SRC_URI += "git://github.com/openbmc/btbridge;branch=master;protocol=https"
-SRCREV="a6ec899618a28a30f7907a6cc90fe027047297d1"
+DBUS_SERVICE:${PN} = "org.openbmc.HostIpmi.service"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
index 24c4941..303a0ef 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
@@ -1,9 +1,7 @@
SUMMARY = "Phosphor IPMI daemon configuration"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit allarch
+PR = "r1"
SRC_URI = " \
file://cipher_list.json \
@@ -17,23 +15,12 @@
file://cs_privilege_levels.json \
"
-FILES:${PN} = " \
- ${datadir}/ipmi-providers/cipher_list.json \
- ${datadir}/ipmi-providers/dcmi_cap.json \
- ${datadir}/ipmi-providers/dcmi_sensors.json \
- ${datadir}/ipmi-providers/dev_id.json \
- ${datadir}/ipmi-providers/power_reading.json \
- ${datadir}/ipmi-providers/channel_access.json \
- ${datadir}/ipmi-providers/channel_config.json \
- ${datadir}/ipmi-providers/entity-map.json \
- ${datadir}/ipmi-providers/cs_privilege_levels.json \
- "
+inherit allarch
do_fetch[noexec] = "1"
do_patch[noexec] = "1"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-
do_install() {
install -d ${D}${datadir}/ipmi-providers
install -m 0644 -D ${WORKDIR}/cipher_list.json \
@@ -55,3 +42,15 @@
install -m 0644 -D ${WORKDIR}/cs_privilege_levels.json \
${D}${datadir}/ipmi-providers/cs_privilege_levels.json
}
+
+FILES:${PN} = " \
+ ${datadir}/ipmi-providers/cipher_list.json \
+ ${datadir}/ipmi-providers/dcmi_cap.json \
+ ${datadir}/ipmi-providers/dcmi_sensors.json \
+ ${datadir}/ipmi-providers/dev_id.json \
+ ${datadir}/ipmi-providers/power_reading.json \
+ ${datadir}/ipmi-providers/channel_access.json \
+ ${datadir}/ipmi-providers/channel_config.json \
+ ${datadir}/ipmi-providers/entity-map.json \
+ ${datadir}/ipmi-providers/cs_privilege_levels.json \
+ "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
index 99a80bc..ee26c04 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
@@ -1,20 +1,22 @@
SUMMARY = "Phosphor OEM IPMI Ethernet Stats Implementation"
DESCRIPTION = "This package handles receiving OEM IPMI commands to provide ethernet device statistics."
HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-ethstats"
-PR = "r1"
-PV = "0.1+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "phosphor-ipmi-host"
+SRCREV = "c8894c55f5d58862f266aebedc43e2652f529a41"
+PV = "0.1+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats;branch=master;protocol=https"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
inherit obmc-phosphor-ipmiprovider-symlink
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "phosphor-ipmi-host"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats;branch=master;protocol=https"
-SRCREV = "c8894c55f5d58862f266aebedc43e2652f529a41"
+EXTRA_OECONF += "--disable-tests"
FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
@@ -22,5 +24,3 @@
FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
HOSTIPMI_PROVIDER_LIBRARY += "libethstatscmd.so"
-
-EXTRA_OECONF += "--disable-tests"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
index 8973eb2..e88c8cf 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
@@ -1,13 +1,8 @@
-HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash"
SUMMARY = "Phosphor OEM IPMI In-band Firmware Update over BLOB"
DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the firmware update handler over the BLOB protocol."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
+HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-inherit meson pkgconfig systemd
-
DEPENDS += " \
phosphor-ipmi-blobs \
phosphor-logging \
@@ -16,7 +11,7 @@
ipmi-blob-tool \
function2 \
"
-
+SRCREV = "a4216a593f339dd4ce96bc7ad316b1100b6ab7a2"
PACKAGECONFIG ?= "cleanup-delete"
PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled"
# If using static-layout, reboot-update is a good option to handle updating.
@@ -24,12 +19,10 @@
# Note that both reboot-update and update-status cannot be enabled at the same time.
PACKAGECONFIG[reboot-update] = "-Dreboot-update=true,-Dreboot-update=false"
PACKAGECONFIG[update-status] = "-Dupdate-status=true,-Dupdate-status=false"
-
# Default options for supporting various flash types:
PACKAGECONFIG[static-bmc] = "-Dupdate-type=static-layout,-Dupdate-type=none"
PACKAGECONFIG[ubitar-bmc] = "-Dupdate-type=tarball-ubi,-Dupdate-type=none"
PACKAGECONFIG[host-bios] = "-Dhost-bios=true,-Dhost-bios=false"
-
# Hardware options to enable transmitting the data from the host.
# Only one type of p2a or lpc can be enabled.
PACKAGECONFIG[aspeed-p2a] = "-Dp2a-type=aspeed-p2a,,,,,aspeed-lpc nuvoton-lpc nuvoton-p2a-vga nuvoton-p2a-mbox"
@@ -38,33 +31,27 @@
PACKAGECONFIG[nuvoton-p2a-vga] = "-Dp2a-type=nuvoton-p2a-vga,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-mbox"
PACKAGECONFIG[nuvoton-p2a-mbox] = "-Dp2a-type=nuvoton-p2a-mbox,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-vga"
PACKAGECONFIG[net-bridge] = "-Dnet-bridge=true,-Dnet-bridge=false"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
-EXTRA_OEMESON = "-Dtests=disabled -Dhost-tool=disabled"
-
-# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly.
-IPMI_FLASH_BMC_ADDRESS ?= "0"
-EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}"
+SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash;branch=master;protocol=https"
S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash;branch=master;protocol=https"
-SRCREV = "a4216a593f339dd4ce96bc7ad316b1100b6ab7a2"
-
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE:${PN} += " \
phosphor-ipmi-flash-bmc-prepare.target \
phosphor-ipmi-flash-bmc-verify.target \
phosphor-ipmi-flash-bmc-update.target \
"
-
-# If they enabled host-bios, add those three extra targets.
-HOST_BIOS_TARGETS = " \
- phosphor-ipmi-flash-bios-prepare.target \
- phosphor-ipmi-flash-bios-verify.target \
- phosphor-ipmi-flash-bios-update.target \
-"
-
SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}"
+inherit meson pkgconfig systemd
+
+EXTRA_OEMESON = "-Dtests=disabled -Dhost-tool=disabled"
+EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
FILES:${PN}:append = " ${libdir}/ipmid-providers"
FILES:${PN}:append = " ${libdir}/blob-ipmid"
FILES:${PN}:append = " ${libdir}/tmpfiles.d"
@@ -74,4 +61,11 @@
BLOBIPMI_PROVIDER_LIBRARY += "liblogblob.so"
BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'cleanup-delete', 'libfirmwarecleanupblob.so', '', d)}"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
+# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly.
+IPMI_FLASH_BMC_ADDRESS ?= "0"
+# If they enabled host-bios, add those three extra targets.
+HOST_BIOS_TARGETS = " \
+ phosphor-ipmi-flash-bios-prepare.target \
+ phosphor-ipmi-flash-bios-verify.target \
+ phosphor-ipmi-flash-bios-update.target \
+"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb
index afa5435..70d3f02 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb
@@ -1,20 +1,18 @@
SUMMARY = "Sample hostfw inventory map for phosphor-ipmi-fru"
-PR = "r1"
+PROVIDES += "virtual/phosphor-ipmi-fru-hostfw-config"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+S = "${WORKDIR}/git"
inherit phosphor-ipmi-fru
inherit native
-require phosphor-ipmi-fru.inc
-
-PROVIDES += "virtual/phosphor-ipmi-fru-hostfw-config"
-
-S = "${WORKDIR}/git"
-
do_install() {
DEST=${D}${hostfw_datadir}
install -d ${DEST}
-
# TODO: copy example hostfw yaml to ${DEST}/config.yaml
# install fru-types.yaml ${DEST}/config.yaml
}
+
+require phosphor-ipmi-fru.inc
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb
index 08425c1..0fe5ca7 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb
@@ -1,16 +1,13 @@
SUMMARY = "Sample inventory map for phosphor-ipmi-fru"
-PR = "r1"
+PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+S = "${WORKDIR}/git"
inherit phosphor-ipmi-fru
inherit native
-require phosphor-ipmi-fru.inc
-
-PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
-
-S = "${WORKDIR}/git"
-
do_install() {
# TODO: install this to inventory_datadir
# after ipmi-fru-parser untangles the host
@@ -19,3 +16,5 @@
install -d ${DEST}
install scripts/example.yaml ${DEST}/config.yaml
}
+
+require phosphor-ipmi-fru.inc
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb
index 64bcbe3..e4e1694 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb
@@ -1,30 +1,26 @@
SUMMARY = "Generate inventory map for phosphor-ipmi-fru from an MRW."
-PR = "r1"
+DEPENDS += "mrw-native mrw-perl-tools-native"
+# TODO: remove this dependency after the MRW script
+# has been updated to not require the hostfw metadata.
+DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config"
+PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+S = "${WORKDIR}/git"
inherit phosphor-ipmi-fru
inherit mrw-xml
inherit native
-require phosphor-ipmi-fru.inc
-
-DEPENDS += "mrw-native mrw-perl-tools-native"
-
-# TODO: remove this dependency after the MRW script
-# has been updated to not require the hostfw metadata.
-DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
-
-S = "${WORKDIR}/git"
do_install() {
-
DEST=${D}${config_datadir}
install -d ${DEST}
-
${bindir}/perl-native/perl \
${bindir}/gen_ipmi_fru.pl \
-i ${mrw_datadir}/${MRW_XML} \
-m ${hostfw_datadir}/config.yaml \
-o ${DEST}/config.yaml
}
+
+require phosphor-ipmi-fru.inc
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
index b893115..5a91a72 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
@@ -3,17 +3,16 @@
which is not sent by host config, and BMC accessible FRU info config \
files generated by gen-ipmi-fru.pl into a single config file. \
fru-gen parser parses the merged config file and generates cpp file"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
-
DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory"
DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
DEPENDS += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory"
PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
+PR = "r1"
+
+inherit phosphor-ipmi-host
+inherit native
do_install:append() {
SRC=${config_datadir}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
index 8de3384..182c206 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
@@ -1,27 +1,24 @@
SUMMARY = "FRU properties config for ipmi-fru-parser"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+DEPENDS += " \
+ mrw-native \
+ mrw-perl-tools-native \
+ "
+PROVIDES += "virtual/phosphor-ipmi-fru-properties"
+PR = "r1"
+
+SRC_URI += "file://config.yaml"
+
+S = "${WORKDIR}"
inherit phosphor-ipmi-fru
inherit mrw-xml
inherit native
-SRC_URI += "file://config.yaml"
-
-DEPENDS += " \
- mrw-native \
- mrw-perl-tools-native \
- "
-
-PROVIDES += "virtual/phosphor-ipmi-fru-properties"
-
-S = "${WORKDIR}"
-
do_install() {
DEST=${D}${properties_datadir}
install -d ${DEST}
-
${bindir}/perl-native/perl \
${bindir}/gen_fru_properties.pl \
-m ${mrw_datadir}/${MRW_XML} \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
index 2caf218..60beb99 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
@@ -1,22 +1,20 @@
SUMMARY = "FRU properties config for ipmi-fru-parser"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-fru
-inherit native
+PROVIDES += "virtual/phosphor-ipmi-fru-properties"
+PR = "r1"
SRC_URI += "file://extra-properties.yaml"
-PROVIDES += "virtual/phosphor-ipmi-fru-properties"
-
S = "${WORKDIR}"
+inherit phosphor-ipmi-fru
+inherit native
+
do_install() {
# This recipe is supposed to create an output yaml file with
# FRU property values extracted from the MRW. This example recipe
# provides a sample output file.
-
DEST=${D}${properties_datadir}
install -d ${DEST}
install extra-properties.yaml ${DEST}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
index bb1addd..c0bfa9f 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
@@ -1,20 +1,18 @@
SUMMARY = "BMC accesible FRU inventory map for phosphor-ipmi-host"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
+PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
+PR = "r1"
SRC_URI += "file://bmc-fru-config.yaml"
S = "${WORKDIR}"
-PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
+inherit phosphor-ipmi-host
+inherit native
do_install:append() {
DEST=${D}${config_datadir}
install -d ${DEST}
install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml
}
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb
index e205200..0b6253a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb
@@ -1,18 +1,17 @@
SUMMARY = "Sample inventory map for phosphor-ipmi-host"
-PR = "r1"
+PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+S = "${WORKDIR}/git"
inherit phosphor-ipmi-host
inherit native
-require phosphor-ipmi-host.inc
-
-PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory"
-
-S = "${WORKDIR}/git"
-
do_install() {
DEST=${D}${config_datadir}
install -d ${DEST}
install scripts/fru-read-example.yaml ${DEST}/config.yaml
}
+
+require phosphor-ipmi-host.inc
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb
index 7a143a4..a18a7a7 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb
@@ -1,28 +1,24 @@
SUMMARY = "Generate inventory map for phosphor-ipmi-host from a MRW."
-PR = "r1"
+DEPENDS += "mrw-native mrw-perl-tools-native"
+DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config"
+PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+S = "${WORKDIR}/git"
inherit phosphor-ipmi-host
inherit mrw-xml
inherit native
-require phosphor-ipmi-host.inc
-
-DEPENDS += "mrw-native mrw-perl-tools-native"
-
-DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config"
-PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory"
-
-S = "${WORKDIR}/git"
-
do_install() {
-
DEST=${D}${config_datadir}
install -d ${DEST}
-
${bindir}/perl-native/perl \
${bindir}/gen_ipmi_fru.pl \
-i ${mrw_datadir}/${MRW_XML} \
-m ${hostfw_datadir}/config.yaml \
-o ${DEST}/config.yaml
}
+
+require phosphor-ipmi-host.inc
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
index e87b8dfd..124aac3 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
@@ -1,20 +1,18 @@
SUMMARY = "The inventory map of frus not sent by host for phosphor-ipmi-host"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
+PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory"
+PR = "r1"
SRC_URI += "file://fru-config-not-sent-by-host.yaml"
S = "${WORKDIR}"
-PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory"
+inherit phosphor-ipmi-host
+inherit native
do_install:append() {
DEST=${D}${config_datadir}
install -d ${DEST}
install fru-config-not-sent-by-host.yaml ${DEST}/fru-config-not-sent-by-host.yaml
}
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
index c91fb7b..7ac14d0 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
@@ -1,16 +1,5 @@
SUMMARY = "Phosphor IPMI Inventory Plugin"
DESCRIPTION = "A Phosphor IPMI plugin that updates inventory."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit autotools pkgconfig
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-ipmiprovider-symlink
-inherit phosphor-ipmi-fru
-inherit python3native
-
-require ${BPN}.inc
-
DEPENDS += " \
virtual/phosphor-ipmi-fru-inventory \
virtual/phosphor-ipmi-fru-properties \
@@ -24,21 +13,19 @@
phosphor-logging \
cli11 \
"
-
-RDEPENDS:${PN} += "bash"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
SRC_URI += "file://of-name-to-eeprom.sh"
SYSTEMD_SERVICE:${PN} += "obmc-read-eeprom@.service"
-
S = "${WORKDIR}/git"
-HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
-
-FILES:${PN} += "${bindir}/of-name-to-eeprom.sh"
-FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+inherit autotools pkgconfig
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-ipmiprovider-symlink
+inherit phosphor-ipmi-fru
+inherit python3native
EXTRA_OECONF = " \
YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
@@ -49,3 +36,14 @@
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir}
}
+
+RDEPENDS:${PN} += "bash"
+
+FILES:${PN} += "${bindir}/of-name-to-eeprom.sh"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+
+require ${BPN}.inc
+
+HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
index 8199cbf..70b60f1 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
@@ -1,27 +1,24 @@
SUMMARY = "Inventory to Sensor config for phosphor-host-ipmi"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+DEPENDS += " \
+ mrw-native \
+ mrw-perl-tools-native \
+ "
+PROVIDES += "virtual/phosphor-ipmi-inventory-sel"
+PR = "r1"
+
+SRC_URI += "file://config.yaml"
+
+S = "${WORKDIR}"
inherit phosphor-ipmi-host
inherit mrw-xml
inherit native
-SRC_URI += "file://config.yaml"
-
-DEPENDS += " \
- mrw-native \
- mrw-perl-tools-native \
- "
-
-PROVIDES += "virtual/phosphor-ipmi-inventory-sel"
-
-S = "${WORKDIR}"
-
do_install() {
DEST=${D}${sensor_datadir}
install -d ${DEST}
-
${bindir}/perl-native/perl \
${bindir}/gen_ipmi_sel.pl \
-i ${mrw_datadir}/${MRW_XML} \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
index 4deaf0d..08ae17d 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
@@ -1,21 +1,19 @@
SUMMARY = "Inventory to Sensor config for non-mrw machines"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
-
PROVIDES += "virtual/phosphor-ipmi-inventory-sel"
+PR = "r1"
SRC_URI += "file://config.yaml"
S = "${WORKDIR}"
+inherit phosphor-ipmi-host
+inherit native
+
do_install() {
# This recipe would provide the sample inventory to sensor config
# mapping, for non-mrw machines.
-
DEST=${D}${sensor_datadir}
install -d ${DEST}
install config.yaml ${DEST}/invsensor.yaml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
index bd4d013..16315e6 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
@@ -1,22 +1,21 @@
SUMMARY = "IPMB bridge"
DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \
implementing IPMB interfaces"
-
-SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https"
-SRCREV = "8978a5a81cddfa86423cd2a0c2a8154858df0151"
-PV = "0.1+git${SRCPV}"
-
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SYSTEMD_SERVICE:${PN} = "ipmb.service"
-
DEPENDS = "sdbusplus \
phosphor-logging \
i2c-tools \
boost \
nlohmann-json"
+SRCREV = "8978a5a81cddfa86423cd2a0c2a8154858df0151"
+PV = "0.1+git${SRCPV}"
+SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https"
+
+SYSTEMD_SERVICE:${PN} = "ipmb.service"
S = "${WORKDIR}/git"
-inherit cmake pkgconfig systemd
+
+inherit cmake pkgconfig systemd
+
FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index 5aba357..291cc8a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -1,24 +1,7 @@
SUMMARY = "Phosphor OpenBMC KCS to DBUS"
DESCRIPTION = "Phosphor OpenBMC KCS to DBUS."
-PR = "r1"
-
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b1beb00e508e89da1ed2a541934f28c0"
-
-inherit meson pkgconfig
-inherit systemd
-
-PV = "1.0+git${SRCPV}"
-
-KCS_DEVICE ?= "ipmi-kcs3"
-
-SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service"
-FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service"
-
-PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS:${PN} += "phosphor-ipmi-host"
-
DEPENDS += " \
fmt \
sdbusplus \
@@ -26,7 +9,23 @@
stdplus \
systemd \
"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/openbmc/kcsbridge.git;branch=master;protocol=https"
+PROVIDES += "virtual/obmc-host-ipmi-hw"
SRCREV = "bc7bf463229b69bb2346cc66f1e4b9f65f5374bd"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/openbmc/kcsbridge.git;branch=master;protocol=https"
+
+SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+inherit systemd
+
+RRECOMMENDS:${PN} += "phosphor-ipmi-host"
+
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
+
+FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service"
+
+KCS_DEVICE ?= "ipmi-kcs3"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index b23efbe..2a63b87 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -1,30 +1,45 @@
+# To add another RMCPP interface, add similar lines to the
+# following lines in a bbappend:
+#
+# ALT_RMCPP_IFACE = "eth1"
+# SYSTEMD_SERVICE:${PN} += " \
+# ${PN}@${ALT_RMCPP_IFACE}.service \
+# ${PN}@${ALT_RMCPP_IFACE}.socket \
+# "
+# Also, be sure to enable a corresponding entry in the channel
+# config file with the same 'name' as the interfaces above
+# Override the default phosphor-ipmi-config.bb with a bbappend
SUMMARY = "Phosphor Network IPMI Daemon"
DESCRIPTION = "Daemon to support IPMI protocol over network"
HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-inherit meson pkgconfig
-inherit systemd
-
DEPENDS += "cli11"
DEPENDS += "phosphor-mapper"
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-host"
-
-RRECOMMENDS:${PN} = "pam-ipmi"
+SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid;branch=master;protocol=https"
-SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2"
S = "${WORKDIR}/git"
+# install parameterized service and socket files
+SYSTEMD_SERVICE:${PN} = " \
+ ${PN}@${RMCPP_IFACE}.service \
+ ${PN}@${RMCPP_IFACE}.socket \
+ "
+
+inherit meson pkgconfig
+inherit systemd
EXTRA_OEMESON = " \
-Dtests=disabled \
"
+RRECOMMENDS:${PN} = "pam-ipmi"
+
FILES:${PN} += " \
${systemd_system_unitdir}/${PN}@.service \
${systemd_system_unitdir}/${PN}@.socket \
@@ -33,23 +48,3 @@
# If RMCPP_IFACE is not set by bbappend, set it to default
DEFAULT_RMCPP_IFACE = "eth0"
RMCPP_IFACE ?= "${DEFAULT_RMCPP_IFACE}"
-
-# install parameterized service and socket files
-SYSTEMD_SERVICE:${PN} = " \
- ${PN}@${RMCPP_IFACE}.service \
- ${PN}@${RMCPP_IFACE}.socket \
- "
-
-# To add another RMCPP interface, add similar lines to the
-# following lines in a bbappend:
-#
-# ALT_RMCPP_IFACE = "eth1"
-# SYSTEMD_SERVICE:${PN} += " \
-# ${PN}@${ALT_RMCPP_IFACE}.service \
-# ${PN}@${ALT_RMCPP_IFACE}.socket \
-# "
-
-# Also, be sure to enable a corresponding entry in the channel
-# config file with the same 'name' as the interfaces above
-# Override the default phosphor-ipmi-config.bb with a bbappend
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
index 19c03fb..3909a2f 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
@@ -1,10 +1,9 @@
SUMMARY = "OpenBMC - IPMI sensors"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} "
+PR = "r1"
inherit native
OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native"
-
-DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
index 45604ce..a762a52 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
@@ -1,18 +1,17 @@
SUMMARY = "sensor config for phosphor-host-ipmid"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
+PR = "r1"
SRC_URI += "file://config.yaml"
S = "${WORKDIR}"
+inherit phosphor-ipmi-host
+inherit native
+
do_install() {
DEST=${D}${sensor_yamldir}
install -d ${DEST}
install config.yaml ${DEST}/config.yaml
}
-
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
index 9232279..c83760c 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
@@ -1,22 +1,20 @@
SUMMARY = "Sensor config for phosphor-host-ipmi"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-ipmi-host
-inherit native
-
PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
+PR = "r1"
SRC_URI += "file://config.yaml"
S = "${WORKDIR}"
+inherit phosphor-ipmi-host
+inherit native
+
do_install() {
# This recipe is supposed to create an output yaml file with
# sensor data extracted from the mrw.
# provides a sample output file.
-
DEST=${D}${sensor_datadir}
install -d ${DEST}
install config.yaml ${DEST}/sensor.yaml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
index 7dd27f7..46a753c 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
@@ -1,25 +1,24 @@
SUMMARY = "Phosphor OpenBMC SSIF to DBUS"
DESCRIPTION = "Phosphor OpenBMC SSIF to DBUS."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit meson pkgconfig
-inherit systemd
-
-SYSTEMD_SERVICE:${PN} = "ssifbridge.service"
-
-PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS:${PN} += "phosphor-ipmi-host"
-
DEPENDS += "systemd"
DEPENDS += "phosphor-logging"
DEPENDS += "sdbusplus"
DEPENDS += "cli11"
+PROVIDES += "virtual/obmc-host-ipmi-hw"
+SRCREV = "88cdf7d12a0e4a8377e5ec664bd60a456cbbb5f3"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
-S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=https;branch=master"
-SRCREV= "88cdf7d12a0e4a8377e5ec664bd60a456cbbb5f3"
+SYSTEMD_SERVICE:${PN} = "ssifbridge.service"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+inherit systemd
+
+RRECOMMENDS:${PN} += "phosphor-ipmi-host"
+
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"