[PATCH 1/3] classes: images: remove cyclic "inherit"

[Henning Schild <henning.schild@siemens.com>]

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/recipes-core/images/isar-image-base.bb | 4 +++-
 meta/classes/ext4-img.bbclass                    | 2 +-
 meta/classes/image.bbclass                       | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 0810de0..25682ed 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
 
 PV = "1.0"
 
-inherit image
+IMAGE_TYPE    ?= "ext4-img"
+
+inherit ${IMAGE_TYPE}
 
 DEPENDS += "${IMAGE_INSTALL}"
 
diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass
index 5125d8e..61699b8 100644
--- a/meta/classes/ext4-img.bbclass
+++ b/meta/classes/ext4-img.bbclass
@@ -1,7 +1,7 @@
 # This software is a part of ISAR.
 # Copyright (C) 2015-2016 ilbers GmbH
 
-inherit isar-base-image
+inherit image
 
 # Extra space for rootfs in MB
 ROOTFS_EXTRA ?= "64"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8db3352..3faa609 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -5,9 +5,6 @@ KERNEL_IMAGE ?= ""
 INITRD_IMAGE ?= ""
 
 IMAGE_INSTALL ?= ""
-IMAGE_TYPE    ?= "ext4-img"
-
-inherit ${IMAGE_TYPE}
 
 do_populate[stamp-extra-info] = "${MACHINE}"
 
-- 
2.13.0