From 06178400afbd641a6709473fd21d893dcd3cfbfa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 6 Nov 2017 09:30:50 -0200 Subject: Stop using image_types_uboot class OE-Core now uses the CONVERSION TYPES to implement the U-Boot support so the class has been removed. This commit removes the code which inherits it so allowing it to keep working with the new code base. Signed-off-by: Otavio Salvador (cherry picked from commit 54544ad1ff48274463977b14c7872872d770ce33) --- classes/mfgtool-initramfs-image.bbclass | 3 +-- conf/machine/include/qoriq-base.inc | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass index afe5124a..65028b8f 100644 --- a/classes/mfgtool-initramfs-image.bbclass +++ b/classes/mfgtool-initramfs-image.bbclass @@ -4,7 +4,7 @@ # image provides the utilities which are used, in the target, during # the process and receive the commands from the MfgTool application. # -# Copyright 2014, 2016 (C) O.S. Systems Software LTDA. +# Copyright 2014-2017 (C) O.S. Systems Software LTDA. DEPENDS += "u-boot-mfgtool linux-mfgtool" @@ -15,7 +15,6 @@ FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" IMAGE_FSTYPES = "cpio.gz.u-boot" IMAGE_FSTYPES_mxs = "cpio.gz.u-boot" IMAGE_ROOTFS_SIZE ?= "8192" -IMAGE_CLASSES += "image_types_uboot" # Filesystems enabled by default DEFAULT_FS_SUPPORT = " \ diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 6c25d50e..2210cf52 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -9,8 +9,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" PREFERRED_PROVIDER_qemu = "qemu-qoriq" PREFERRED_VERSION_testfloat = "2a" -IMAGE_CLASSES += "image_types_uboot" - SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" -- cgit v1.2.3-54-g00ecf