From 089ecdc6cef61098264a49c32d3baa50b2577b30 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 20 Oct 2018 21:40:37 -0400 Subject: 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 --- meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/gpio') diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb index 7508458972..d94e245b3f 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 -- cgit v1.2.3