diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2020-04-03 23:48:30 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-07 02:47:05 +0300 |
| commit | fb700fddee4ab1f68bf1db4ff5584174b42d680e (patch) | |
| tree | 5a791931fd8a89ba5962e606c1254a447e26fc71 | |
| parent | 75e941953612d41dcd5bbf52732d4acf72d05fd4 (diff) | |
| download | openbmc-fb700fddee4ab1f68bf1db4ff5584174b42d680e.tar.xz | |
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>
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 1d7f514b2..34a615b87 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 @@ control applications." 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 ba14ff8b7..301e4e788 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 @@ platforms." 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 7d803424b..da0388798 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 obmc-phosphor-ipmiprovider-symlink 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 f4339348e..56df13bdd 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 @@ SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service 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 0bf71567a..9fdeea0f0 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 @@ DESCRIPTION = "Daemon to cater to triggering actions on LED groups" 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 146824579..730335a0f 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 pkgconfig inherit systemd inherit python3native -require ${PN}.inc +require ${BPN}.inc S = "${WORKDIR}/git" |