From 0f0cde691fe09fb7c52f0fbb0af3a657ecb09822 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 30 Jan 2018 08:18:32 -0500 Subject: Drop references to image_types_uboot.bbclass With the sync to poky 2.3.3 various bugfixes of mine have been backported upstream. At this point in time there is no longer a image_types_uboot.bbclass file as instead the required logic is now always part of image_types.bbclass. Change-Id: Ie762adec19a5f31409d72b2ccfded532b8286c15 Bug-AGL: SPEC-1270 Signed-off-by: Tom Rini --- meta-agl-bsp/classes/image.bbclass | 9 --------- meta-netboot/classes/netboot.bbclass | 3 --- 2 files changed, 12 deletions(-) diff --git a/meta-agl-bsp/classes/image.bbclass b/meta-agl-bsp/classes/image.bbclass index ccaffce60..7e4654627 100644 --- a/meta-agl-bsp/classes/image.bbclass +++ b/meta-agl-bsp/classes/image.bbclass @@ -146,15 +146,6 @@ inherit ${IMAGE_TYPE_vm} IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}' inherit ${IMAGE_TYPE_container} -def build_uboot(d): - if 'u-boot' in (d.getVar('IMAGE_FSTYPES') or ''): - return "image_types_uboot" - else: - return "" - -IMAGE_TYPE_uboot = "${@build_uboot(d)}" -inherit ${IMAGE_TYPE_uboot} - IMAGE_TYPE_wic = "image_types_wic" inherit ${IMAGE_TYPE_wic} diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 65ca4a15d..1cdfd5f84 100644 --- a/meta-netboot/classes/netboot.bbclass +++ b/meta-netboot/classes/netboot.bbclass @@ -1,8 +1,5 @@ # Enable network bootable image and initrd/initramfs -# add image classes for uboot -IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}" - python () { if (bb.utils.contains_any("IMAGE_FSTYPES",["live","vmdk","vmdk.xz"],True,False,d)): # typical case for Minnowboard Max -- cgit 1.2.3-korg