summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-10-02 17:22:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 23:11:11 +0100
commit9d1502bccd983158db55f97e9f88a08a27be21ea (patch)
tree10bef16089dfb32daf785926084dfcf006265ff2
parent2884c4874309825ecb0a7c22a039981c44e2390a (diff)
downloadpoky-9d1502bccd983158db55f97e9f88a08a27be21ea.tar.gz
image-live.bbclass: allow images to override ROOTFS and INITRD
(From OE-Core rev: e8011abfab79220102e4843d8a91655162140090) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image-live.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index c910488d64..1d184a1e00 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -1,11 +1,11 @@
1 1
2AUTO_SYSLINUXCFG = "1" 2AUTO_SYSLINUXCFG = "1"
3INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz" 3INITRD ?= "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
4APPEND += "root=/dev/ram0 " 4APPEND += "root=/dev/ram0 "
5TIMEOUT = "10" 5TIMEOUT = "10"
6LABELS += "boot install" 6LABELS += "boot install"
7 7
8ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" 8ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
9 9
10do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs" 10do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
11do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs" 11do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"