From 6c9e01403c96774cd130e553f258c1a0c5821ce7 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 3 Apr 2020 15:45:27 -0500 Subject: meta-openpower: PN.inc to BPN.inc Some recipes have abstracted the git revision into a separate file and have a line 'require ${PN}.inc'. The issue with PN is that it changes to have a -native or -nativesdk for those contexts. The variable ${BPN} (base package name) should be used instead. (From meta-openpower rev: df35a2536cf347e9a4e5b15ae48b59630722d08d) Signed-off-by: Patrick Williams Change-Id: I12040750b349bc36601c00a1b355d81ded2a0a01 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 2 +- meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb | 2 +- meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb | 2 +- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 4e4362571..d637aac27 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -10,7 +10,7 @@ inherit autotools \ pythonnative \ phosphor-dbus-yaml -require ${PN}.inc +require ${BPN}.inc DEPENDS += " \ phosphor-logging \ diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb index 8275fe77f..4f7713378 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig inherit obmc-phosphor-ipmiprovider-symlink inherit pythonnative -require ${PN}.inc +require ${BPN}.inc DEPENDS += "phosphor-ipmi-host" DEPENDS += "autoconf-archive-native" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 9fcf93b0c..548bdb044 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -10,7 +10,7 @@ inherit autotools \ python3native \ phosphor-dbus-yaml -require ${PN}.inc +require ${BPN}.inc SRC_URI += "file://occ-active.sh" do_install_append() { diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb index e986f17d9..b82ae84da 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb @@ -8,7 +8,7 @@ inherit openpower-fru-vpd inherit python3native inherit obmc-phosphor-systemd -require ${PN}.inc +require ${BPN}.inc SRC_URI += "file://70-op-vpd.rules" -- cgit v1.2.3