From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449326914083487744 X-Received: by 10.28.93.144 with SMTP id r138mr110282wmb.28.1501600936761; Tue, 01 Aug 2017 08:22:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.154.12 with SMTP id c12ls258220lfe.28.gmail; Tue, 01 Aug 2017 08:22:16 -0700 (PDT) X-Received: by 10.25.44.133 with SMTP id s127mr880259lfs.4.1501600935769; Tue, 01 Aug 2017 08:22:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501600935; cv=none; d=google.com; s=arc-20160816; b=F4uKwqborL/dBDFTrJTGEl9pRhhrnuODh4yYE3nOIzEkJ5qvwXT0qzZyh2icQVLHfw 5XMM4JE0C/1d+iftYz2wNNSOhvcXrnqxbo5d3Zli+xwNQNTCjyufcFmeM94HU8Egw0jg QLy334elq1Nr1394voWbHWqQEbm2pGz6hpmenLLq4FaUWVdZf6BlQKMHORnrfMZ5eoXx VE7sPBJLcxr28Sb+molWlk0T8symTy+PiG46xYWa/sHei/f1QkSFe6/eynW7Kf897vv2 3qrejTOMbJiPz3ZKFXkU0cxqM7jBpDsOY7RiHf79AzMcPdyKrgjdptv1m9TiLnei29pM UOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=toVAVEBitqPHeBWzFHXqnpnK3cF/iHk/Xxpn/QGLpkI=; b=sJZQI9RhmCc0DWYTlBo7ddZEDds2d4I5Lb2WYOjQEmODdfwjI3DI1mzzXDf1uiwch9 iGqM0VG8vio8ht3SOwV/zNpqdtu2kxHuKcUy+VeDJJC8C/vLTcUNQeiQL7aJqI3w1H2M 4IwqLxFCLM5vPBPj0h4CcQNm9NLIG3C28MFZ/ydluLUZ2obO7/TwGBY72ZlJF0O5MJXJ kLCGf/jn1f9JTRYzkwW+908bKH3Rxm4IcidWCZn7ZtbYpipXJ/Wox50xQ7qXDxVBdRId slSiNW2kqeJnJsUlZ5g40Tz1e7u/MJJMJY81RRUAZymhLWRrf2WgqGMM+wKTHImmKsMc jWeQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 72si137997wmo.9.2017.08.01.08.22.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 08:22:15 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v71FMFAx012071 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 1 Aug 2017 17:22:15 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v71FMFDw017501; Tue, 1 Aug 2017 17:22:15 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 1/3] classes: images: remove cyclic "inherit" Date: Tue, 1 Aug 2017 17:24:06 +0200 Message-Id: <23a4ea9c98a5834651eed2888b02a2bdbe1d2ac3.1501600807.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: jr/+m3USwBi0 Signed-off-by: Henning Schild --- 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