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 beda4ca..a377ecf 100644 (file)
--- 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')}"