From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6491554293275951104 X-Received: by 10.28.20.11 with SMTP id 11mr873792wmu.29.1511432765452; Thu, 23 Nov 2017 02:26:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.139.221 with SMTP id w29ls1572036wra.11.gmail; Thu, 23 Nov 2017 02:26:05 -0800 (PST) X-Google-Smtp-Source: AGs4zMZlCD1/rWsoSUqyNCx7EbAMgCGRsyRIBFAtzXNfrXBcncBfLt5vRPcxSGa4nSzvtR8MvdaM X-Received: by 10.28.12.206 with SMTP id 197mr868880wmm.10.1511432765069; Thu, 23 Nov 2017 02:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511432764; cv=none; d=google.com; s=arc-20160816; b=YHD/1bYDRIJ5dFc0ayDKCg87be57wVBm8HoPzG7g2dTgXDkl52UhpFCgEWQ+oroXH7 eh8+Gfvzr6AiipWgQfSDo4Mq5JkhuGH83dSlGALqmAtsZxg3/9ACs+HoenQVk+/pFuay cIkVM80JM10uYRBgENCwrupBiraLyWysbHbnKKmUqG8wudVxPr5GqBWBlWB1aMZJmD2K 63r2rfTOWFm1ewAmxUrdVbK0zL9il0FmfnuS43xF+G+mG51dBipqJiZgd/26r3551DOO 97hlvFrwfly0V44x12s3VMXJpcq0mAsXksMl33xiSojceXO7BzdXlmo3QH7nTVT3uNgW yq+w== 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=+avsKBlDAYz4ofO5KeBZPNUxibZKZNLjP5FDrHbyr38=; b=pwxyibxe61eTWQ2YfooNHPFrjYq4dUuv/tx+1L7bioqNWOnefGQJqLGgAptRR1XOyB rmzkU5GuN5IIBmtwyPPL9yBBQCIPdbQpiESnEaaxmVcgyyC/7EDEms2cs5UyiKiqXxXh uLCLgl5VcdexERLL7M9+1c6vJlycZZgyQP5qDqEOg4NR9zaYCn62dW6JAlxhig5XYgsJ SGR3ooRMw3pZ49h20wqfRSk/IdyhM0sDhBANSrPoryM4FvY5d9qCjm8BvaSSt+CLZpHs VSSUiwlt23MlH5JSaFEYLFsUApI8z4OYzMi0qxbtgfBHjwTFxHH3nQaDV+lFkPcgKmaY JB4g== 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 k6si754327wme.4.2017.11.23.02.26.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 02:26:04 -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 vANAPlsV005990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Nov 2017 11:25:56 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 2/4 v2] image: Add do_rootfs template to image class Date: Thu, 23 Nov 2017 13:25:30 +0300 Message-Id: <20171123102532.26274-3-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171123102532.26274-1-asmirnov@ilbers.de> References: <20171123102532.26274-1-asmirnov@ilbers.de> X-TUID: KgbDhFXV917a 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 c2150b1..ad776ed 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