From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6490941990528614400 X-Received: by 10.25.67.78 with SMTP id m14mr604885lfj.26.1511290204300; Tue, 21 Nov 2017 10:50:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.33.148 with SMTP id h20ls291201lji.3.gmail; Tue, 21 Nov 2017 10:50:03 -0800 (PST) X-Google-Smtp-Source: AGs4zMbIQPzBDPPOor9RenwampEDC14wLCEuD6WWwpl1CE5S1KaShosf9FqDcT3ODBPuJ2IhJs9r X-Received: by 10.25.125.136 with SMTP id y130mr568563lfc.13.1511290203776; Tue, 21 Nov 2017 10:50:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511290203; cv=none; d=google.com; s=arc-20160816; b=Gg1/zKLIfkBlq3N/prkML4HbBW9xR36k2MOcVjGT0FtjtqOAJ3GtAuyFBWgcMk6kHz 3xk+JUQG/wfseXGim+AHMFvG7QN+x8kq3DdTZK09TDaE7EFjbAwugmXV7xaItZT3p7hn Z+aPYMWesDh7Y4aVD1jfo1bz1jP2vtK28KqbRGAsPlCsTs+6+0oOCSrtNO1ziRbK4MYB 5pnsedGQRmb7t41eiD9xcoHCjN+rVnoH/C3z/h4Jc4orNviGNX/R/V3iCi6Clj4nki1m Yl3a6wrkevKPouAJIueY5UUZQN+nTIFYlgfOEJEHAY6zqHR2r9lX/pxaphdE8/qlNU3z uHUA== 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=OGgIvf0k+tbXeNI9lhdf8VBDZU1PngXXkyNHovGsb0k=; b=zVtqWhn8hsM1KVt/qtysYw0YSvAlDSqQmkEa+4JK9yBmaNJ6lmXswW7XwJnVDVBxG8 +F3gG+LOFG5t3hFK44d+gri4Jd6LG9gaCviuLWYiO2bwMIHpgQ6ldfyG7kciUMcaarh0 VC261gnXJLDEbed1INfk5i21CLnHQPbZCzQZg8a3OAjop+yO7z4kAs93GMLAH4vz6H+7 6iyK371320Mm/5lYXjw5YUDWRPSaJxr3eUXCHRH81vTabuh9tcpPUnODbpI5xE331FoI 74btKqeyMHhGAK07roDeJ3eA8Uj3qDe8k+JAhCPReFmwVN6oC2O+rwX2aPoWMeMHFkDH uPVg== 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 g190si1011773lfg.4.2017.11.21.10.50.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2017 10:50:03 -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 vALInkox001587 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2017 19:49:54 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 2/3] image: Add do_rootfs template to image class Date: Tue, 21 Nov 2017 21:49:39 +0300 Message-Id: <20171121184940.5425-3-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171121184940.5425-1-asmirnov@ilbers.de> References: <20171121184940.5425-1-asmirnov@ilbers.de> X-TUID: Ws22JzGmrh5L Add 'do_rootfs' task template to the image class because it's mandatory task for image generation. Moreover image class already has dependencies from 'do_rootfs' what makes it inconsistent for now. Also this patch moves generic task parameters to the class from image recipe. 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