diff options
| -rw-r--r-- | meta/classes/image-empty.bbclass | 0 | ||||
| -rw-r--r-- | meta/classes/image-live.bbclass | 13 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 15 |
4 files changed, 29 insertions, 2 deletions
diff --git a/meta/classes/image-empty.bbclass b/meta/classes/image-empty.bbclass new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/classes/image-empty.bbclass diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass new file mode 100644 index 0000000000..c910488d64 --- /dev/null +++ b/meta/classes/image-live.bbclass @@ -0,0 +1,13 @@ + +AUTO_SYSLINUXCFG = "1" +INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${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] += "${IMAGE_BASENAME}:do_rootfs" + +inherit bootimg diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index edfb2d68c5..79a56f0408 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -29,6 +29,9 @@ LDCONFIGDEPEND_libc-uclibc = "" do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" +IMAGE_TYPE = ${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)} +inherit image-${IMAGE_TYPE} + python () { deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split(): diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index f1aef86fad..cd901c105f 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -1,7 +1,18 @@ + def get_imagecmds(d): cmds = "\n" old_overrides = bb.data.getVar('OVERRIDES', d, 0) - for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split(): + + types = bb.data.getVar('IMAGE_FSTYPES', d, True).split() + # Live images will be processed via inheriting bbclass and + # does not get processed here. + # live images also depend on ext3 so ensure its present + if "live" in types: + if "ext3" not in types: + types.append("ext3") + types.remove("live") + + for type in types: localdata = bb.data.createCopy(d) localdata.setVar('OVERRIDES', '%s:%s' % (type, old_overrides)) bb.data.update_data(localdata) @@ -103,4 +114,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native" IMAGE_DEPENDS_ubifs = "mtd-utils-native" # This variable is available to request which values are suitable for IMAGE_FSTYPES -IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma" +IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma" |