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:10:54 +0000 |
| commit | 5ac3dc76a5afc2ed35b1abfc8e330e0c580eadf0 (patch) | |
| tree | aa165329c2874b171e776da3f8b3046048a3f650 | |
| parent | 3322fa76706dcafbaf3329abe2fafb950b8b6fa0 (diff) | |
| download | poky-5ac3dc76a5afc2ed35b1abfc8e330e0c580eadf0.tar.gz | |
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.
(From OE-Core rev: 0d02159c8d66bb136f7da2c10fda7d1a57f40cec)
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() { | |||
| 474 | manifest_name = d.getVar('IMAGE_MANIFEST', True) | 474 | manifest_name = d.getVar('IMAGE_MANIFEST', True) |
| 475 | taskname = d.getVar("BB_CURRENTTASK", True) | 475 | taskname = d.getVar("BB_CURRENTTASK", True) |
| 476 | subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() | 476 | subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() |
| 477 | imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or "${IMAGE_NAME_SUFFIX}." | 477 | imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") |
| 478 | os.chdir(deploy_dir) | 478 | os.chdir(deploy_dir) |
| 479 | 479 | ||
| 480 | if not link_name: | 480 | if not link_name: |