diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2016-03-07 22:13:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 22:01:16 +0000 |
| commit | 0d02159c8d66bb136f7da2c10fda7d1a57f40cec (patch) | |
| tree | 3fdd07f957ba1b052ff40433728db1603a11b66a | |
| parent | 380ee36811939d947024bf78de907e3c071b834f (diff) | |
| download | openembedded-core-0d02159c8d66bb136f7da2c10fda7d1a57f40cec.tar.gz openembedded-core-0d02159c8d66bb136f7da2c10fda7d1a57f40cec.tar.bz2 openembedded-core-0d02159c8d66bb136f7da2c10fda7d1a57f40cec.zip | |
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 <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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: |