From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6490941990528614400 X-Received: by 10.28.167.83 with SMTP id q80mr321402wme.1.1511290205733; Tue, 21 Nov 2017 10:50:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.21.85 with SMTP id 82ls448870wmv.0.canary-gmail; Tue, 21 Nov 2017 10:50:05 -0800 (PST) X-Google-Smtp-Source: AGs4zMb9+kCMNtoOcPurCBe8AuuYYBV1xly2dMpXD3MyGHm1lTxfRboTcfXseVbKpf5H4vQ7/X4n X-Received: by 10.223.133.143 with SMTP id 15mr262023wrt.31.1511290205150; Tue, 21 Nov 2017 10:50:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511290205; cv=none; d=google.com; s=arc-20160816; b=LNv9LKmg43pcGPDDvBPH8nkgrtCttc0g21VZLLsaz8KQp8vAkK9Eke37RzWXoZvbJ+ y500IrOvTRpSgDt0tkcGlNfj5J5TmvpQK1TO7+MrjDK7VUw7H8zFiaMkx1naSVmDm2Y5 NaNbOmiqVOsUEWS+FDyR8MthNBmz8wmIHUZIwL0hKWFH+hTG54zAOZpPVYcBLp/IixoW 2LLX+NvZEY5ZLeD4wDj85pXPFSO5WVNatG3Tu3g9CsP5H6n1wxxNXU0GYJ+EzkmJ8uZX Xlv58zUJT+7EgWpxA4nv1DODBAv/VxtCopd8a9I+SuXvwr/4Gd1l1KIGZwLNiJO2MSh+ j09Q== 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=F7nxs9WFf4vRXi0AQDa05Wk1QCAMsJZ+En8feG+z8/s=; b=V2hHKJ8o0Kx/7LR6maVkvEBAHS5lYULshTe3/kKs1OhVTp6ra1QYl6Vee58fES3xI9 Xa9+COJ89RiRQ+Mc4Kcv3sSwDgnJ8abVh1Q0OrpE5SopMYJx5vlL2EtgoQUdrjkREumr hu/u5SLxO2X46RYxD3oDmvdLw50WAHPbtSZxCDEJKED40n7JDuVVHhlijKQQ5AR4m0jB 6DXVoI/Po1KsY1BILUMAW0cJBdGxz4V/KtLnIYZX1yQ2XnJLtwBZkk9VdHTS/cK65s7y 68cMib0jHt6fPUbWElTyQqkwBX6J5bf6VISkZNz7APj2AOd1l2xMLhaiJ7mGo1uV2Ndp qdmA== 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 i76si229198wmd.0.2017.11.21.10.50.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2017 10:50:05 -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 vALInkp0001587 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2017 19:49:55 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 3/3] buildchroot: Add prepare and cleanup tasks Date: Tue, 21 Nov 2017 21:49:40 +0300 Message-Id: <20171121184940.5425-4-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: Uik+nJN+gjxY Some packages could require builchroot filesystem tunning, for example share Isar downloads folder with chroot filesystem. This patch adds two tasks for buildchroot: 1. 'do_prepare': This task is executed after buildchroot rootfs generation and before 'do_build' from packages to be built. Some notes: - An individual task is required for the case when you want to rebuild some package, this would require to run this preparation stuff for existing buildchroot rootfs. - This task should not have stamp. This means that anytime you want to build something, 'do_prepare' should be executed. 2. 'do_cleanup': This task is executed after all the packages are deployed. Some notes: - This task also should not have stamp. - This task depends from the recipes listed in IMAGE_INSTALL. Signed-off-by: Alexander Smirnov --- meta/classes/dpkg-base.bbclass | 2 +- meta/classes/image.bbclass | 1 + meta/recipes-devtools/buildchroot/buildchroot.bb | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 4941f9b..21ae88d 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -2,7 +2,7 @@ # Copyright (C) 2017 Siemens AG # Add dependency from buildchroot creation -do_build[depends] = "buildchroot:do_build" +do_build[depends] = "buildchroot:do_prepare" # Each package should have its own unique build folder, so use # recipe name as identifier diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7813b16..b0f645c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -83,6 +83,7 @@ do_populate() { addtask populate before do_build after do_unpack do_populate[deptask] = "do_deploy_deb" +do_populate[depends] = "buildchroot:do_cleanup" do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 6a94733..4be094c 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -71,3 +71,21 @@ do_build() { sudo chroot ${BUILDCHROOT_DIR} /configscript.sh _do_build_cleanup } + +do_prepare[nostamp] = "1" + +do_prepare() { + bbnote "Prepare buildchroot for packages building" +} + +addtask prepare after do_build + +DEPENDS += "${IMAGE_INSTALL}" +do_cleanup[deptask] = "do_deploy_deb" +do_cleanup[nostamp] = "1" + +do_cleanup() { + bbnote "Cleanup buildchroot after packages building" +} + +addtask cleanup after do_prepare -- 2.9.5