meta-phosphor: temp remove PV for git recipes
In the five step sequence of transitioning an unversioned recipe to
a versioned one, PV cannot be explicitly set to 1.0+git${SRCPV} set
until the last step.
With PV set, _both_ the unversioned recipe and the versioned recipe
end up with PV = 1.0 and bitbake will continue to use the unversioned
file. This means that when the unversioned bbappends are removed in
step 4, the bbappend does not occur.
This commit can be reverted once the five step process is complete.
For reference, the five step process is:
1.
Create a temporary recipe symlink:
foo.bb -> foo_git.bb
This results in two available PVs for foo: "1.0" (the bitbake default
for unversioned recipes) and "git".
Further, set the preferred version for foo to "1.0" in the distro
configuration otherwise bitbake will choose PV = "git" and existing
(unversioned) bbappends will not apply and the build will break.
2.
Create a temporary bbappend symlink:
foo.bbappend -> foo_%.bbappend
This allows the manual override of the preferred version introduced in
step 1 to be removed from the distro configuration.
3.
Remove the preferred version override introduced in step 1 from the
distro configuration. At this point the versioned recipe is now being
used.
4.
Remove the unversioned bbappends.
5.
Remove the unversioned recipe.
Change-Id: Ifb4efd5fcc29e958267243964085ab61aa3ca828
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
index fb850b1..184127f 100644
--- a/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
+++ b/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
@@ -2,7 +2,6 @@
DESCRIPTION = "Phosphor DBus Monitor is a general purpose DBus application \
that watches DBus traffic for events and takes actions based on those events."
PR = "r1"
-PV = "1.0+git${SRCPV}"
HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
diff --git a/recipes-phosphor/dump/phosphor-debug-collector.bb b/recipes-phosphor/dump/phosphor-debug-collector.bb
index 3ac005b..da3151b 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector.bb
+++ b/recipes-phosphor/dump/phosphor-debug-collector.bb
@@ -5,7 +5,6 @@
based systems."
PR = "r1"
-PV = "1.0+git${SRCPV}"
DEBUG_COLLECTOR_PKGS = " \
${PN}-manager \
diff --git a/recipes-phosphor/fans/phosphor-fan.bb b/recipes-phosphor/fans/phosphor-fan.bb
index f9bb489..9e4db30 100644
--- a/recipes-phosphor/fans/phosphor-fan.bb
+++ b/recipes-phosphor/fans/phosphor-fan.bb
@@ -2,7 +2,6 @@
DESCRIPTION = "Phosphor fan provides a set of fan monitoring and \
control applications."
PR = "r1"
-PV = "1.0+git${SRCPV}"
require ${PN}.inc
diff --git a/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
index 7508458..d94e245 100644
--- a/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
+++ b/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
@@ -2,7 +2,6 @@
DESCRIPTION = "Application to monitor gpio assertions"
HOMEPAGE = "http://github.com/openbmc/phosphor-gpio-monitor"
PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit autotools pkgconfig
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
index da061d1..fef42ba 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
@@ -1,7 +1,6 @@
SUMMARY = "Phosphor OpenBMC IPMI daemon"
DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries"
PR = "r1"
-PV = "1.0+git${SRCPV}"
RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs"
diff --git a/recipes-phosphor/logging/phosphor-logging.bb b/recipes-phosphor/logging/phosphor-logging.bb
index 7805c9c..3bc8a57 100644
--- a/recipes-phosphor/logging/phosphor-logging.bb
+++ b/recipes-phosphor/logging/phosphor-logging.bb
@@ -3,7 +3,6 @@
supporting tools for OpenBMC."
HOMEPAGE = "https://github.com/openbmc/phosphor-logging"
PR = "r1"
-PV = "1.0+git${SRCPV}"
inherit autotools pkgconfig
inherit pythonnative
diff --git a/recipes-phosphor/mboxd/mboxd.bb b/recipes-phosphor/mboxd/mboxd.bb
index e1583d7..69a1354 100644
--- a/recipes-phosphor/mboxd/mboxd.bb
+++ b/recipes-phosphor/mboxd/mboxd.bb
@@ -1,7 +1,6 @@
SUMMARY = "Phosphor OpenBMC MBOX Daemon"
DESCRIPTION = "Phosphor OpenBMC MBOX Daemon"
PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
diff --git a/recipes-phosphor/network/network.bb b/recipes-phosphor/network/network.bb
index b74ef8b..527d1b3 100644
--- a/recipes-phosphor/network/network.bb
+++ b/recipes-phosphor/network/network.bb
@@ -2,7 +2,6 @@
DESCRIPTION = "Network DBUS object"
HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
PR = "r1"
-PV = "1.0+git${SRCPV}"
inherit autotools pkgconfig
inherit pythonnative
diff --git a/recipes-phosphor/state/phosphor-state-manager.bb b/recipes-phosphor/state/phosphor-state-manager.bb
index 2ec65c1..bee8076 100644
--- a/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/recipes-phosphor/state/phosphor-state-manager.bb
@@ -4,7 +4,6 @@
platforms."
HOMEPAGE = "https://github.com/openbmc/phosphor-state-manager"
PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"