diff options
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index e3863c88a9..5374d6125e 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
| @@ -84,6 +84,8 @@ do_image_wic[deptask] += "do_image_complete" | |||
| 84 | 84 | ||
| 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
| 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" |
| 87 | # Unified kernel images need objcopy | ||
| 88 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" | ||
| 87 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 89 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
| 88 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" | 90 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" |
| 89 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" | 91 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" |
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index ba0916cb56..daaf3ea576 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb | |||
| @@ -6,7 +6,8 @@ DEPENDS = "\ | |||
| 6 | parted-native gptfdisk-native dosfstools-native \ | 6 | parted-native gptfdisk-native dosfstools-native \ |
| 7 | mtools-native bmap-tools-native grub-native cdrtools-native \ | 7 | mtools-native bmap-tools-native grub-native cdrtools-native \ |
| 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ | 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ |
| 9 | e2fsprogs-native util-linux-native tar-native\ | 9 | e2fsprogs-native util-linux-native tar-native \ |
| 10 | virtual/${TARGET_PREFIX}binutils \ | ||
| 10 | " | 11 | " |
| 11 | DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" | 12 | DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" |
| 12 | DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" | 13 | DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" |
