summaryrefslogtreecommitdiffstats
path: root/meta/packages/images
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-10 22:07:29 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-10 22:07:29 +0000
commitadf85c06ea68ff80038e4a4be2f979e466fc143a (patch)
treea4e273144a3d0da384cc41fa0906f028fdd27871 /meta/packages/images
parent6b2db1eb1ab96cf19a22791b483959e8944c0c43 (diff)
downloadpoky-adf85c06ea68ff80038e4a4be2f979e466fc143a.tar.gz
poky-image-live.inc: Only run the FSTYPES check when the task is run
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5175 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/images')
-rw-r--r--meta/packages/images/poky-image-live.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/packages/images/poky-image-live.inc b/meta/packages/images/poky-image-live.inc
index a3119a8740..9a21a28f4f 100644
--- a/meta/packages/images/poky-image-live.inc
+++ b/meta/packages/images/poky-image-live.inc
@@ -1,9 +1,3 @@
1python __anonymous () {
2 import bb
3 fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
4 if 'ext3' not in fstypes:
5 bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
6}
7 1
8AUTO_SYSLINUXCFG = "1" 2AUTO_SYSLINUXCFG = "1"
9INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" 3INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
@@ -13,3 +7,11 @@ APPEND += "root=/dev/ram0 video=vesafb:800x600-16@60 vga=788"
13do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" 7do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
14 8
15inherit bootimg 9inherit bootimg
10
11do_bootimg_prepend () {
12 import bb
13 fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
14 if 'ext3' not in fstypes:
15 bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
16}
17