From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6491554293275951104 X-Received: by 10.80.167.162 with SMTP id i31mr7546785edc.9.1511432766893; Thu, 23 Nov 2017 02:26:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.159.161 with SMTP id c30ls2163159edf.1.gmail; Thu, 23 Nov 2017 02:26:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMbkmfU+Wk8KAz4bJO1W9PIwrLKdDOomvJR4iW+z+13ncZqjFjWu4Z8Y8SNs7MRd1wlqbfrX X-Received: by 10.80.195.1 with SMTP id a1mr3773683edb.8.1511432766606; Thu, 23 Nov 2017 02:26:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511432766; cv=none; d=google.com; s=arc-20160816; b=m57SqilSX/3clp0CP6BxCVeDjILrO77f9hh5OKLV2iaHX+2Y9j18xQnaBL/lmed2XT PZ3PJF3L07xHptwuvx0P0N47ohMddC5p2u12bWa99w3wxtMeAJoeg2E6SuOipfp3NOWL yAhJ4ZpjhcyNrD459hnOTfUd1GZPBippW34VFOmE9bhjmH8cHTKgz8jaLnfpyhHaNo9Q K18w2c/4lb6HfOgPC0MJm4ztUqCz4UYvfI4KftBNQ0rrds1hjqzGDgOi34NfMxPPt8RZ U4cs941pjHuJm85XcOf5GoFoeDnRSbaAMlzqxyOYEx1GTDACu5ZRXa/TgdZ5J1vuVuPM nY8w== 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=0MXxv/EyKF3at5sV4XG9WP+zb7m22CsUGSe/vMF5VuM=; b=U9xeOh63oqV2m2zGeXQzYXtISZdmLwULZYox/3GbtBbpY5Inkg4ojylQKes8QW1VK+ bQvqwFUHOujUjKITnsVVy+WhS++xAn9vk/A1DeDy8HFAwTMU+ZooXK1JsxKEx4EV4ecp 9iizlmVEHoJJtYPSTX8sYAJ23TL1e/zUlnJ/rVamGGHl4YUJsThrgECGlt2iFFUsiVGD zhERDO8VSQzOAcIV7dvBkr5kC489jLI9z5W1Higx4roGg8M4AoMDu3LNPB2jUJ9Py5v+ hR4fRVwB8lfVuMZ/7D0+UimesB469JlaUIhMlHVtirfr0t7vIfALH3Qui1PQkkBNj8Sa opjg== 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 a67si1382868edf.3.2017.11.23.02.26.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 02:26:06 -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 vANAPlsW005990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Nov 2017 11:25:57 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 3/4 v2] buildchroot: Add prepare and cleanup tasks Date: Thu, 23 Nov 2017 13:25:31 +0300 Message-Id: <20171123102532.26274-4-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: OepoF7WCCkqw 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 | 21 +++++++++++++++++++++ 3 files changed, 23 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..fe88e98 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -67,7 +67,28 @@ do_build() { # Install package builder script sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR} + # Create share point for downloads + sudo install -d ${BUILDCHROOT_DIR}/git + # Configure root filesystem sudo chroot ${BUILDCHROOT_DIR} /configscript.sh _do_build_cleanup } + +do_prepare[nostamp] = "1" + +do_prepare() { + sudo mount --bind ${GITDIR} ${BUILDCHROOT_DIR}/git +} + +addtask prepare after do_build + +DEPENDS += "${IMAGE_INSTALL}" +do_cleanup[deptask] = "do_deploy_deb" +do_cleanup[nostamp] = "1" + +do_cleanup() { + sudo umount ${BUILDCHROOT_DIR}/git +} + +addtask cleanup after do_prepare -- 2.9.5