diff options
| author | Naveen Saini <naveen.kumar.saini@intel.com> | 2019-07-25 13:53:34 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-26 08:41:39 +0100 |
| commit | b8cbefb3fdb4b62a8a536c717359fd6314335cb7 (patch) | |
| tree | 6d79a418a77784128c3b3f6e51ddd36c5fbded62 | |
| parent | 21e2686775366dd4891e0d36d3812dc5a74d46fc (diff) | |
| download | poky-b8cbefb3fdb4b62a8a536c717359fd6314335cb7.tar.gz | |
image_types_wic: add syslinux-native dependency conditional
Add syslinux-native dependency only for IA host machines.
Able to build wic image successfully for below template which
uses legacy bios(syslinux):
https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/scripts/lib/wic/canned-wks/directdisk-gpt.wks
[YOCTO #13276]
(From OE-Core rev: 7e2ee2b59319e1d2c185d65de47cc8f5c048dd03)
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 97d681b1b3..519aeb1b04 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
| @@ -47,7 +47,8 @@ do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r | |||
| 47 | # We ensure all artfacts are deployed (e.g virtual/bootloader) | 47 | # We ensure all artfacts are deployed (e.g virtual/bootloader) |
| 48 | do_image_wic[recrdeptask] += "do_deploy" | 48 | do_image_wic[recrdeptask] += "do_deploy" |
| 49 | 49 | ||
| 50 | WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 50 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
| 51 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | ||
| 51 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 52 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
| 52 | WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" | 53 | WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" |
| 53 | WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" | 54 | WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" |