From 79809ea7c46e7d54bfb9e3d7ac185d9965c4a81d Mon Sep 17 00:00:00 2001 From: Joseph Reynolds Date: Fri, 26 Feb 2021 15:37:31 -0600 Subject: native class is not inherited last Moved "inherit native" statements to the last position to remove QA Issues. The message is: WARNING: QA Issue: {RECIPENAME}: native/nativesdk class is not inherited last, this can result in unexpected behaviour. Classes inherited after native/nativesdk: {CLASSFILES} [native-last] Tested: The witherspoon image builds without the warnings. Signed-off-by: Joseph Reynolds Change-Id: Ic3c71234abfcac8b26478bc32808e3bec8bba810 --- .../recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb | 2 +- .../power/witherspoon-pfault-analysis-error-native_git.bb | 2 +- meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb | 2 +- meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb | 2 +- .../recipes-phosphor/ipmi/hostboot-inventory-config-native.bb | 2 +- .../recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb | 2 +- .../ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb | 2 +- .../recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb | 2 +- .../occ/openpower-occ-control-config-example-native_git.bb | 2 +- .../recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-properties-example-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb | 2 +- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb | 2 +- meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb | 2 +- .../flash/phosphor-software-manager-error-native_git.bb | 2 +- .../ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb | 2 +- .../ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb | 2 +- .../ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb | 2 +- .../ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb | 2 +- .../ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb | 2 +- .../ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb | 2 +- .../ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb | 2 +- .../recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb | 2 +- .../recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb | 2 +- .../logging/phosphor-logging-callouts-example-native.bb | 2 +- .../recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb | 2 +- meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb | 2 +- meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb | 2 +- meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb | 2 +- meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb | 2 +- .../recipes-phosphor/settings/phosphor-settings-defaults-native.bb | 2 +- .../settings/phosphor-settings-read-settings-mrw-native.bb | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb index a52e93762..6d4edb337 100644 --- a/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb +++ b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging +inherit native SRC_URI += "file://callouts.yaml" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 3c174c3e8..5ea6cb522 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-dbus-yaml +inherit native require recipes-phosphor/power/phosphor-power.inc diff --git a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb index 2edb98d3c..a0f8b81d8 100644 --- a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb index c2332d56e..84cce2cb0 100644 --- a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb index bd0a8eea4..0cc6016ab 100644 --- a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb index 2e71bfc2d..bdf669b13 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb @@ -3,8 +3,8 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-dbus-yaml +inherit native require openpower-ipmi-oem.inc diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb index 6e2c1fc5d..49aa58cf3 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://openpower-config.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb index 1c8758793..3b190a63c 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb @@ -3,5 +3,5 @@ DESCRIPTION = "Whitelisted OpenBMC IPMI OEM commands for OpenPOWER based systems LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host-whitelist +inherit native diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb index 723d59e04..394297d67 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb @@ -2,9 +2,9 @@ SUMMARY = "OpenPower OCC Control with example occ sensor IDs" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native require openpower-occ-control.inc inherit openpower-occ-control +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index 796088546..db9ce5d5e 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-occ-control inherit mrw-xml +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb index 3c9c8eae2..8d94042e2 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb index be0779fef..5e190418a 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb index 67107a6e8..cb24b2686 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://example.yaml" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb index 42b1f37e4..5e6fcf724 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb index 5b0188614..69d57f7db 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb index 37b9f64b3..ca88023d9 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb @@ -6,8 +6,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-mapper +inherit native PHOSPHOR_MAPPER_CONFIGS = " \ phosphor-dbus-interfaces-mapper-config-native \ diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb index 806f07ca5..85e289687 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb @@ -4,8 +4,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-dbus-yaml +inherit native require phosphor-software-manager.inc 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 5c3d278ef..afa543578 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 @@ -2,8 +2,8 @@ SUMMARY = "Sample hostfw inventory map for phosphor-ipmi-fru" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru +inherit native 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 b113ba403..08425c13a 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 @@ -2,8 +2,8 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-fru" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru +inherit native 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 805b3a7c6..64bcbe3dd 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 @@ -2,9 +2,9 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-fru from an MRW." PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru inherit mrw-xml +inherit native 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 d86b7e9f6..ec10b7db2 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 @@ -7,8 +7,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory" DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory" 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 5c1a4b4c0..8de3384ab 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 @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" 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 5b56f6bd7..2caf218cb 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru +inherit native SRC_URI += "file://extra-properties.yaml" 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 dc696b138..d3b15c9f5 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://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 96736c64a..e20520005 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 @@ -2,8 +2,8 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-host" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-host +inherit native 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 0f993e8e7..7a143a417 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 @@ -2,9 +2,9 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-host from a MRW." PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-host inherit mrw-xml +inherit native 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 828648745..aad4aac1f 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://fru-config-not-sent-by-host.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb index a4e93e260..17c685e61 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb @@ -3,5 +3,5 @@ DESCRIPTION = "Whitelisted IPMI FRU Parser commands for OpenBMC" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host-whitelist +inherit native 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 86a6411c7..8199cbf34 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 @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" 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 2a0aab673..4deaf0de1 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native PROVIDES += "virtual/phosphor-ipmi-inventory-sel" 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 76fff8e27..45604ced4 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb index c3666857c..fffadc1c3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb @@ -3,10 +3,10 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host inherit python3native inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ 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 1f5df6d27..923227971 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 @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index 4eeb6cec5..648bf2140 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit mrw-xml +inherit native PROVIDES += "virtual/phosphor-led-manager-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb index a24476745..5d86f8aeb 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb @@ -4,8 +4,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-dbus-yaml +inherit native require phosphor-led-manager.inc diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb index 7362c792f..88baca5b0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging +inherit native SRC_URI += "file://callouts.yaml" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb index 9515c6882..6bb86915e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb index b8c311bd1..f6581beb1 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" S = "${WORKDIR}/git" -inherit native inherit perlnative inherit cpan-base inherit mrw-rev +inherit native DEPENDS += "libxml-simple-perl-native json-perl-native" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb index b17b7f63a..d9776021e 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb @@ -6,8 +6,8 @@ PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" inherit obmc-xmlpatch -inherit native inherit mrw-xml +inherit native PHOSPHOR_MRW_LICENSE ?= "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb index 97de44896..c507894c8 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit native inherit mrw-rev +inherit native DEPENDS += "python3-native python3-lxml-native" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb index 0d79e39ee..95ce05ca3 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb @@ -6,9 +6,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit native inherit cpan_build inherit mrw-rev +inherit native DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb index eaf9fba4a..77693af4d 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-settings-manager +inherit native SRC_URI += "file://defaults.yaml" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb index 7490d54d2..a67d6819d 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb @@ -7,9 +7,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-settings-manager inherit mrw-xml +inherit native DEPENDS += "mrw-native mrw-perl-tools-native" -- cgit v1.2.3