From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6491554293275951104 X-Received: by 10.46.58.23 with SMTP id h23mr1291849lja.32.1511733655955; Sun, 26 Nov 2017 14:00:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.101.66 with SMTP id z63ls1637814ljb.7.gmail; Sun, 26 Nov 2017 14:00:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMYSS9xLkYJ8K2CR4ycEo+hU3BTps9JF2B7fMft9NRvrJ4MEUmZnu+PkdaHpEwAePHPcl4+U X-Received: by 10.25.198.195 with SMTP id w186mr1105453lff.10.1511733655667; Sun, 26 Nov 2017 14:00:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511733655; cv=none; d=google.com; s=arc-20160816; b=Oc4tSUqntAaE7EHw7/UNW88G4FeE3Ilbj6LH6CaqR4OzZokps9ZC1rf4f+y88R/4Ni jxJk7DBvyvuZ9xzWmy5xtGQngLyC4LsfGg36uwR4yqpArarUHIUdYALOxetp2Sd17hDu 08Rap+IccZ89ymDzUr+Qa9IPSRKGNmk1tDe4hVbqSzQpTgnxHrXDC6uXNzf68OMcAzik XNLfv7TNxQZhC/gNouwJbvFk7PQpma4U+IsrqGXK/JFQ4tWTpXy11ed+VmSgTDrHn02j Umhjgs1SE1SE+641J5pGQ2HNo6gr4ux13ddaN4MnNP9Uqzk6jdcV9lIE8ulkGkIsEMNN 1uIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Thb5A7DTOBImwgarrC1qwEjzmMgUmFtUZpnJjHAQjQI=; b=q4bEHend6+VMRDQ/EbOTD2m4xp1ILHHuhUAGk1Nz7SHGufltJ9yHdIH62JpWgFDhGe 9UlmVO5ueieauBZDYbNHzwYzCipDtnhajOfKZrzCGnvriWYOcKKcB7y1BYyVfm+3vGJm L8F8wlneQ+1G+NUMU0XxsIyFUb6pzsBPSa786K4umldKzElAeMILNIiCGnKK69YRvRIq j+aWxmYReJhY2zyowN7IUoUCMN1MdVeltndF/W7bqM0ivu0R1XNhwXrCnMZNIrUeqCuE 0B79jAO1OTruLGS/GgLa1zh7vyrAH8EYMlOICV7oq4NfNlvgw4Q3PoP0aZB5FBhhau1/ 3wFQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id q77si135096lfi.1.2017.11.26.14.00.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 14:00:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id vAQM0WuN016985 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 26 Nov 2017 23:00:39 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v3 2/4] image: Add do_rootfs template to image class Date: Mon, 27 Nov 2017 01:00:23 +0300 Message-Id: <20171126220025.14168-3-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171126220025.14168-1-asmirnov@ilbers.de> References: <20171126220025.14168-1-asmirnov@ilbers.de> X-TUID: Rjd1/dg4uhpU Add 'do_rootfs' task template to the image class due to it's mandatory task. Moreover image class already has deps from 'do_rootfs' what makes it inconsistent for now. Also this patch removes trailing empty line. Signed-off-by: Alexander Smirnov --- meta-isar/recipes-core/images/isar-image-base.bb | 3 --- meta/classes/image.bbclass | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index a6906c6..32d1abd 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -26,7 +26,6 @@ IMAGE_PREINSTALL += "apt \ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" -do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" do_rootfs[dirs] = "${WORKDIR}/hooks_multistrap" do_rootfs() { @@ -70,5 +69,3 @@ do_rootfs() { sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" _do_rootfs_cleanup } - -addtask rootfs before do_build after do_populate diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2c2bafc..7813b16 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -84,6 +84,14 @@ do_populate() { addtask populate before do_build after do_unpack do_populate[deptask] = "do_deploy_deb" +do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" + +do_rootfs() { + die "No root filesystem function defined, please implement in your recipe" +} + +addtask rootfs before do_build after do_populate + do_copy_boot_files() { KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')} if [ -n "${KERNEL_IMAGE}" ]; then -- 2.9.5