classes/image*: Revamp creation of live images
This creates a live image as an IMAGE_FSTYPES, thus removing the need to have additional -live.bb recipes. To create a live image one just needs to add live to the IMAGE_FSTYPES list (From OE-Core rev: b3ff63796cd6629975ff0a726ba18cc168e0a2b2) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
39130137e4
commit
ba8a726b7d
|
@ -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
|
|
@ -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():
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue