diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-13 15:55:58 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-13 15:55:58 +0000 |
| commit | 2fbccac5dfe715fe0bd7cfb26c41fd905eaf89ab (patch) | |
| tree | 6340d011c24b794ea4aca677a3a57a6b56f407a8 | |
| parent | 42e69299606457d2e5a7e6ba69183439e648d6ec (diff) | |
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
| -rw-r--r-- | classes/image_ipk.oeclass | 4 | ||||
| -rw-r--r-- | conf/oe.conf | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass index 1f9cb17955..beda4ca206 100644 --- 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 a8749d441f..4363661956 100644 --- 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}" |