Add IMAGE_DEPENDS variables and make use of them in image_ipk.oeclass.

NOTE: This was never done in the past because it puts package names from our
packages repo into oe.conf.  Now that packages and oe are split, this is okay.

BKrev: 4145c30e6CZrYYsOkmiKnf4jBc5eIw

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index 1f9cb17..beda4ca 100644 (file)
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -2,7 +2,9 @@ inherit rootfs_ipk
 
 USE_DEVFS ?= "0"
 
-DEPENDS += "mtd-native makedevs-native"
+DEPENDS += "makedevs-native"
+OVERRIDES += ":${IMAGE_FSTYPE}"
+DEPENDS += "${IMAGE_DEPENDS}"
 
 IMAGE_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-minimal.txt')}"
 

diff --git a/conf/oe.conf b/conf/oe.conf
index a8749d4..4363661 100644 (file)
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -156,9 +156,6 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
 PACKAGE_ARCH = "${TARGET_ARCH}"
 MACHINE_ARCH = "${MACHINE}"
 
-#IMAGE_DEPENDS = ""
-#IMAGE_DEPENDS_jffs2 = "mtd-buildarch"
-
 IMAGE_BASENAME = "rootfs"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_CMD = ""
@@ -174,6 +171,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 IMAGE_ROOTFS_SIZE_ext2 = "65536"
 
+IMAGE_DEPENDS = ""
+IMAGE_DEPENDS_jffs2 = "mtd-native"
+IMAGE_DEPENDS_cramfs = "mkcramfs-native"
+IMAGE_DEPENDS_ext2 = "genext2fs-native"
+IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
+
 IMAGE_FSTYPE = "jffs2"
 IMAGE_FSTYPES = "${IMAGE_FSTYPE}"