From: Chris Larson <clarson@kergoth.com>
Date: Mon, 13 Sep 2004 18:58:07 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~17212
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdda4c0d3c4b720fe456b86e84a8bce9129b8fa8;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/oe/packages

2004/09/13 14:57:58-04:00 handhelds.org!kergoth
Update the IMAGE_DEPENDS bits to add all the deps for the types in IMAGE_FSTYPES, rather than only the one in IMAGE_FSTYPE.

BKrev: 4145edbf-n81LLyJ7AivNnYo9XigjA
---

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index beda4ca206..a377ecf02c 100644
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -3,8 +3,17 @@ inherit rootfs_ipk
 USE_DEVFS ?= "0"
 
 DEPENDS += "makedevs-native"
-OVERRIDES += ":${IMAGE_FSTYPE}"
-DEPENDS += "${IMAGE_DEPENDS}"
+
+def get_image_deps(d):
+	import oe
+	str = ""
+	for type in (oe.data.getVar('IMAGE_FSTYPES', d, 1) or "").split():
+		deps = oe.data.getVar('IMAGE_DEPENDS_%s' % type, d) or ""
+		if deps:
+			str += " %s" % deps
+	return str
+
+DEPENDS += "${@get_image_deps(d)}"
 
 IMAGE_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-minimal.txt')}"