[oe-commits] Otavio Salvador : image-live.bbclass: allow override of initrd image

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 989238c366499aa3420c5594a7e256e50c78cc4b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=989238c366499aa3420c5594a7e256e50c78cc4b

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 11 19:18:49 2011 +0000

image-live.bbclass: allow override of initrd image

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

---

 meta/classes/image-live.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1d184a1..e85ac1e 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -1,13 +1,14 @@
 
 AUTO_SYSLINUXCFG = "1"
-INITRD ?= "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
+INITRD_IMAGE ?= "core-image-minimal-initramfs"
+INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
 APPEND += "root=/dev/ram0 "
 TIMEOUT = "10"
 LABELS += "boot install"
 
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 
-do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
+do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
 do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
 
 inherit bootimg