mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-25 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

image.bbclass: Improve readability of the image generation code

Browse Source 
The quoting in get_imagecmds() is hard to read. We can simplify the constuction
a little to make this easier to parse and reduce complexity slightly.

(From OE-Core rev: da5d038f955bf47155a0f217dba2f96e263bcad8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-03-24 12:23:10 +00:00
parent 25a6e5f98c
commit b94de9a24a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/image.bbclass
View File

@@ -69,16 +69,22 @@ def get_imagecmds(d):
old_overrides = bb.data.getVar('OVERRIDES', d, 0) old_overrides = bb.data.getVar('OVERRIDES', d, 0)
for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split(): for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split():
localdata = bb.data.createCopy(d) localdata = bb.data.createCopy(d)
bb.data.setVar('OVERRIDES', '%s:%s' % (type, old_overrides), localdata) localdata.setVar('OVERRIDES', '%s:%s' % (type, old_overrides))
bb.data.update_data(localdata) bb.data.update_data(localdata)
cmd = "\t#Code for image type " + type + "\n" localdata.setVar('type', type)
cmd += "\t${IMAGE_CMD_" + type + "}\n" cmd = localdata.getVar("IMAGE_CMD_" + type, True)
cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n" localdata.setVar('cmd', cmd)
cmd += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n" cmds += localdata.getVar("runimagecmd", True)
cmd += "\tln -s ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n"
cmds += bb.data.expand(cmd, localdata)
return cmds return cmds
runimagecmd () {
# Image generation code for image type ${type}
${cmd}
cd ${DEPLOY_DIR_IMAGE}/
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
ln -s ${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
}
IMAGE_POSTPROCESS_COMMAND ?= "" IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= "" MACHINE_POSTPROCESS_COMMAND ?= ""
ROOTFS_POSTPROCESS_COMMAND ?= "" ROOTFS_POSTPROCESS_COMMAND ?= ""