Skip to contentSkip to conversation

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

PATCH In review Chris Larson 2 participants 3 messages Jun 17, 2009 – Jun 18, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bitbake.conf, package_ipk.bbclass: rather than including FILE in SRC_URI, move that fallback to package_ipk.

---
 classes/package_ipk.bbclass |    3 ++-
 conf/bitbake.conf           |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
classes/package_ipk.bbclass +2 -1
index d4cb3b6..da7abb4 100644
@@ -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()))
conf/bitbake.conf +1 -1
index adb248e..4cdc56f 100644
@@ -543,7 +543,7 @@ SRCDATE = "${DATE}"
 SRCREV = "1"
 AUTOREV = "${@bb.fetch.get_srcrev(d)}"
 
-SRC_URI = "file://${FILE}"
+SRC_URI = ""
 
 ##################################################################
 # UI/Interaction Configuration
Signature · 1 line
1.6.0
#1 lore raw

Dnia środa, 17 czerwca 2009 o 21:00:21 Chris Larson napisał(a):

Quoted 3 lines
 classes/package_ipk.bbclass |    3 ++-
 conf/bitbake.conf           |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

What if I use package_deb or package_rpm?

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#2 lore raw
Quoted 6 lines · Marcin Juszkiewicz

Dnia środa, 17 czerwca 2009 o 21:00:21 Chris Larson napisał(a):

Quoted 3 lines
classes/package_ipk.bbclass |    3 ++-
conf/bitbake.conf           |    2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

What if I use package_deb or package_rpm?

Good question, I'll test. The reason I only went with package_ipk is that package_ipk is why SRC_URI got set that way to begin with, due to ipkg requiring Source to create a package :)

Signature · 5 lines
Chris Larson
Software Engineer
MontaVista Software, Inc.
Email: clarson AT mvista DOT com
Email: clarson AT kergoth DOT com