From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mail.openembedded.org (Postfix) with ESMTP id C3E7260746 for ; Mon, 21 Mar 2016 18:56:10 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 21 Mar 2016 11:56:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,373,1455004800"; d="scan'208";a="673341559" Received: from linux.intel.com ([10.23.219.25]) by FMSMGA003.fm.intel.com with ESMTP; 21 Mar 2016 11:56:12 -0700 Received: from vmed.fi.intel.com (vmed.fi.intel.com [10.237.72.51]) by linux.intel.com (Postfix) with ESMTP id A33EC6A4004; Mon, 21 Mar 2016 12:43:53 -0700 (PDT) From: Ed Bartosh To: openembedded-core@lists.openembedded.org Date: Mon, 21 Mar 2016 18:36:10 +0200 Message-Id: <1458578170-13054-1-git-send-email-ed.bartosh@linux.intel.com> X-Mailer: git-send-email 2.1.4 Subject: [PATCH] image.bbclass: run wicenv task only for wic images X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 18:56:14 -0000 Currently do_wicenv task is run for all images. However, its result is used only to produce wic image. It's better to run this task only for wic images. If another rootfs is required to produce wic image, dependency to its do_wicenv must be added to the wic image recipy. Stopped running do_wicenv for all images. Added explicit dependency to this task in wic-image-minimal recipe. [YOCTO #9095] Signed-off-by: Ed Bartosh --- meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +- meta/classes/image.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 9c50ddb..e98f60f 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -11,7 +11,7 @@ DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-nativ # core-image-minimal is referenced in .wks, so we need its rootfs # to be ready before our rootfs -do_rootfs[depends] += "core-image-minimal:do_rootfs_wicenv" +do_rootfs[depends] += "core-image-minimal:do_rootfs core-image-minimal:do_rootfs_wicenv" IMAGE_ROOTFS_EXTRA_SPACE = "2000" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3ab432e..63a0fb6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -275,7 +275,7 @@ python do_rootfs_wicenv () { if value: envf.write('%s="%s"\n' % (var, value.strip())) } -addtask do_rootfs_wicenv after do_image before do_image_wic do_image_complete +addtask do_rootfs_wicenv after do_rootfs before do_image_wic do_rootfs_wicenv[vardeps] += "${WICVARS}" do_rootfs_wicenv[prefuncs] = 'set_image_size' -- 2.1.4