summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-20 21:40:37 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-21 11:02:57 -0400
commit089ecdc6cef61098264a49c32d3baa50b2577b30 (patch)
tree812e4c2b8255fc33bda47afcf0b3a3f5740013dd
parent3748b12a4e16e5533f683a875131eda5cd12897b (diff)
downloadtalos-openbmc-089ecdc6cef61098264a49c32d3baa50b2577b30.tar.gz
talos-openbmc-089ecdc6cef61098264a49c32d3baa50b2577b30.zip
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. (From meta-phosphor rev: 883e0238adc8543b28cce8a5d283d2092026da54) Change-Id: I3c5248a41b064462d5a34a7bc6e5438acc107a32 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/mboxd/mboxd.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/network/network.bb1
-rw-r--r--meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb1
9 files changed, 0 insertions, 9 deletions
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
index fb850b1f8..184127f15 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
@@ -2,7 +2,6 @@ SUMMARY = "Phosphor DBus Monitor"
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/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
index 3ac005b88..da3151b9c 100644
--- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
@@ -5,7 +5,6 @@ This will be helpful for troubleshooting the problems in OpenBMC \
based systems."
PR = "r1"
-PV = "1.0+git${SRCPV}"
DEBUG_COLLECTOR_PKGS = " \
${PN}-manager \
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
index f9bb489b0..9e4db307a 100644
--- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
@@ -2,7 +2,6 @@ SUMMARY = "Phosphor Fan"
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/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
index 750845897..d94e245b3 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
@@ -2,7 +2,6 @@ SUMMARY = "Phosphor GPIO monitor application"
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/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
index da061d16e..fef42ba7a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
+++ b/meta-phosphor/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/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
index 7805c9cac..3bc8a5704 100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "An error and event log daemon application, and \
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/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
index e1583d7a7..69a135479 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
+++ b/meta-phosphor/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/meta-phosphor/recipes-phosphor/network/network.bb b/meta-phosphor/recipes-phosphor/network/network.bb
index b74ef8b33..527d1b381 100644
--- a/meta-phosphor/recipes-phosphor/network/network.bb
+++ b/meta-phosphor/recipes-phosphor/network/network.bb
@@ -2,7 +2,6 @@ SUMMARY = "Network DBUS object"
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/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
index 2ec65c11f..bee80766e 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
@@ -4,7 +4,6 @@ management daemons. It is suitable for use on a wide variety of OpenBMC \
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"
OpenPOWER on IntegriCloud