meta-phosphor: 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-phosphor rev: c7d848ec9b524114550f80276f7b5e45b9ad8d46)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ib875fd9904b16379b20dc7891087b8e0bf90fe69
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
index 1d7f514..34a615b 100644
--- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
@@ -4,7 +4,7 @@
PR = "r1"
PV = "1.0+git${SRCPV}"
-require ${PN}.inc
+require ${BPN}.inc
inherit autotools pkgconfig pythonnative
inherit obmc-phosphor-systemd
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
index ba14ff8..301e4e7 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -5,7 +5,7 @@
PR = "r1"
PV = "1.0+git${SRCPV}"
-require ${PN}.inc
+require ${BPN}.inc
SOFTWARE_MGR_PACKAGES = " \
${PN}-version \
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 7d80342..da03887 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
@@ -9,7 +9,7 @@
inherit phosphor-ipmi-fru
inherit pythonnative
-require ${PN}.inc
+require ${BPN}.inc
DEPENDS += " \
virtual/phosphor-ipmi-fru-inventory \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index f433934..56df13b 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -63,7 +63,7 @@
RRECOMMENDS_${PN} += "phosphor-settings-manager"
-require ${PN}.inc
+require ${BPN}.inc
# Setup IPMI Whitelist Conf files
WHITELIST_CONF = " \
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
index 0bf7156..9fdeea0 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -3,7 +3,7 @@
PR = "r1"
PV = "1.0+git${SRCPV}"
-require ${PN}.inc
+require ${BPN}.inc
inherit autotools pkgconfig python3native
inherit obmc-phosphor-dbus-service obmc-phosphor-systemd
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
index 1468245..730335a 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
@@ -9,7 +9,7 @@
inherit systemd
inherit python3native
-require ${PN}.inc
+require ${BPN}.inc
S = "${WORKDIR}/git"