[yocto] [meta-raspberrypi][PATCH 2/2] bootfiles, vc-graphics: consolidate SRC_URI and S variables

[Paul Barker]

The variables RPIFW_SRC_URI and RPIFW_S are created in the common firmware
include file so that it is easier to override the firmware source in a local or
distro config file. RPIFW_SRC_URI is used to set SRC_URI in firmware.inc as it
is common to both bootfiles and vc-graphics. RPIFW_S is used as a prefix for S
in bcm2835-bootfiles.bb and vc-graphics.inc as different subdirectories are
referenced in each recipe.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
---
 recipes-bcm/bootfiles/bcm2835-bootfiles.bb | 6 +-----
 recipes-bcm/common/firmware.inc            | 3 +++
 recipes-bcm/vc-graphics/vc-graphics.inc    | 9 +++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
index 28d1639..36cbcf5 100644
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
@@ -9,11 +9,7 @@ RDEPENDS_${PN} = "rpi-config"
 
 COMPATIBLE_MACHINE = "raspberrypi"
 
-SRC_URI = " \
-        git://github.com/raspberrypi/firmware.git;protocol=git;branch=master  \
-"
-
-S = "${WORKDIR}/git/boot"
+S = "${RPIFW_S}/boot"
 
 PR = "r3"
 
diff --git a/recipes-bcm/common/firmware.inc b/recipes-bcm/common/firmware.inc
index 166bb7b..e291832 100644
--- a/recipes-bcm/common/firmware.inc
+++ b/recipes-bcm/common/firmware.inc
@@ -1,6 +1,9 @@
 # 7/1/2013 firmware; this can be overridden from distro config
 RPIFW_SRCREV ?= "0ac68cce44d4550c251172e8524100090e8211fa"
 RPIFW_DATE ?= "20130107"
+RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
+RPIFW_S ?= "${WORKDIR}/git"
 
+SRC_URI = "${RPIFW_SRC_URI}"
 SRCREV = "${RPIFW_SRCREV}"
 PV = "${RPIFW_DATE}"
diff --git a/recipes-bcm/vc-graphics/vc-graphics.inc b/recipes-bcm/vc-graphics/vc-graphics.inc
index 28c95a1..e9575da 100644
--- a/recipes-bcm/vc-graphics/vc-graphics.inc
+++ b/recipes-bcm/vc-graphics/vc-graphics.inc
@@ -8,11 +8,12 @@ COMPATIBLE_MACHINE = "raspberrypi"
 
 include ../common/firmware.inc
 
-SRC_URI = "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master\
-           file://egl.pc \
-           file://vchiq.sh"
+SRC_URI += " \
+    file://egl.pc \
+    file://vchiq.sh \
+"
 
-S = "${WORKDIR}/git/${VCDIR}"
+S = "${RPIFW_S}/${VCDIR}"
 
 INCPR = "r1"
 
-- 
1.8.2.2