]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
image-live.bbclass: allow override of initrd image
authorOtavio Salvador <otavio@ossystems.com.br>
Tue, 11 Oct 2011 19:18:49 +0000 (19:18 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 14 Oct 2011 12:18:15 +0000 (13:18 +0100)
(From OE-Core rev: 989238c366499aa3420c5594a7e256e50c78cc4b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image-live.bbclass

index 1d184a1e00910ed96fc6bbb06600b8c617110b3b..e85ac1e8f20babf5db5eac8ffaf5c625ff048c46 100644 (file)
@@ -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