From 0d02159c8d66bb136f7da2c10fda7d1a57f40cec Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 7 Mar 2016 22:13:48 +0100 Subject: image.bbclass: fix incomplete .rootfs customization The patch for making the .rootfs configurable was incomplete: in the python create_symlinks() method the new variable must be expanded explicitly. Not doing so broke the symlink creation and that led to hard build failures in image types depending on the boot-directdisk.bbclass (like qcow2) because the build_boot_dd() method relied on the symlink. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 081a0b32c6..8b6c30bce8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -474,7 +474,7 @@ python create_symlinks() { manifest_name = d.getVar('IMAGE_MANIFEST', True) taskname = d.getVar("BB_CURRENTTASK", True) subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() - imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or "${IMAGE_NAME_SUFFIX}." + imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") os.chdir(deploy_dir) if not link_name: -- cgit 1.2.3-korg