[oe] [PATCH] bitbake.conf, package_ipk.bbclass: rather than including FILE in SRC_URI, move that fallback to package_ipk.

[Chris Larson]

Signed-off-by: Chris Larson <clarson at mvista.com>
---
 classes/package_ipk.bbclass |    3 ++-
 conf/bitbake.conf           |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index d4cb3b6..da7abb4 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -260,7 +260,8 @@ python do_package_ipk () {
 			ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces))
 		if rconflicts:
 			ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts))
-		src_uri = bb.data.getVar("SRC_URI", localdata, 1)
+		src_uri = bb.data.getVar("SRC_URI", localdata, 1) or \
+		          bb.data.expand("file://${FILE}", localdata)
 		if src_uri:
 			src_uri = re.sub("\s+", " ", src_uri)
 			ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index adb248e..4cdc56f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -543,7 +543,7 @@ SRCDATE = "${DATE}"
 SRCREV = "1"
 AUTOREV = "${@bb.fetch.get_srcrev(d)}"
 
-SRC_URI = "file://${FILE}"
+SRC_URI = ""
 
 ##################################################################
 # UI/Interaction Configuration
-- 
1.6.0