From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519007876157014016 X-Received: by 10.223.150.47 with SMTP id b44mr396935wra.0.1517938318772; Tue, 06 Feb 2018 09:31:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.191.3 with SMTP id p3ls3337053wrh.2.gmail; Tue, 06 Feb 2018 09:31:58 -0800 (PST) X-Google-Smtp-Source: AH8x224ku7CKrRO9qEk2M/AVFI+EH8pea2C0SI9wOt070SomWzukm+aKsEV1VmjWbThqkwBDEHRQ X-Received: by 10.223.133.198 with SMTP id 6mr373627wru.31.1517938318159; Tue, 06 Feb 2018 09:31:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517938318; cv=none; d=google.com; s=arc-20160816; b=CxnhuJAAhNRkla68Jnx5SKXGgDMRPKATcBorTAKQRsdmyxfMN8Z+YGpTO8VKITnNr6 w2peKvScv3GixLSZkRfEWHwFqs+d/8zz0kPI5xU15KrsIgbnCwfILeOu5q0TTJcIQbbP qgS0NWwmoh0i86SsHyVMBjJsYfCBThljqo9yqg/lmqmFYBG5+EqiaN2VJXyK1IP3uUgC R7bU0h7eUnXXs5A77EZCGOOzKITY37O10BUJ2SkQOla26o/8tQ5mjHOPwlgnCK99HWwi zwTTcUb6ZUgjrXjcw+xjBkmdlsvHJRE0wbSKyzBudJ7a6F2NX01EthwgpCAdZtMCTlWP 84Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :arc-authentication-results; bh=7ntgqk6B3Rl7Y0hAAvAZfvmpoA9Pfu8NrHnqWZh4gI0=; b=LrZaSF9KpIFl36USSAal0L9rSUS3RMFTPiyWkxsKRhJWgWQT79uTcFskGipr6kiGi8 ZDmdnUpWW86tnu5ccRW0wPP70j/8H9x3Ibn7PH8pzjpOzqJx15WSUTH14w2m+krm57QZ ubPLGnzjahihS5u54NCY7fDc94SpxfAhh7wj9r/3Vp5wMPRo2Y3sxoa0rLmhkJ7Mq1kQ VlMH4tadE+6zjcBEdhMZ5DE2BxTFXjNoOJAfqNYKIdbMGyvXTPBnflj9pS029vD2kHYN VUgC6PGD2LV4BewZ4zpLcitLtf0j+sX7a1BKcOt8+UhNNe/aYtaBnQC2UiGTf52SL8/9 75IA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id a12si1379542wmg.4.2018.02.06.09.31.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 09:31:58 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w16HVvYd030547 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 6 Feb 2018 18:31:57 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w16HVtra007683; Tue, 6 Feb 2018 18:31:56 +0100 Subject: Re: [PATCH 3/5 v4] buildchroot: Enable isar-apt To: Alexander Smirnov , isar-users@googlegroups.com References: <20180205095931.23903-1-asmirnov@ilbers.de> <20180206135725.28502-1-asmirnov@ilbers.de> From: Jan Kiszka Message-ID: <3fa05bea-15fc-3caa-24c7-dfc262b9909a@siemens.com> Date: Tue, 6 Feb 2018 18:31:55 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180206135725.28502-1-asmirnov@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: izI/fgjugwk/ On 2018-02-06 14:57, Alexander Smirnov wrote: > 8<-- > > Branch to test: asmirnov/devel > > 8<-- > > This patch provides access to isar-apt from buildchroot. It does the > following: > - mount isar-apt during buildchroot building. > - umount isar-apt using bitbake events. > > Also it needs to keep Isar build tree clean from any mounts despite on whether > build succeed of failed. bitbake provides various events that could trigger > custom python hooks. In this patch BuildCompleted event is used, which happened > when bitbake finished its execution despite on the result. > > Signed-off-by: Alexander Smirnov > --- > meta/classes/dpkg-base.bbclass | 2 +- > meta/classes/isar-events.bbclass | 20 ++++++++++++++++ > meta/conf/isar-bitbake.conf | 3 +++ > meta/recipes-devtools/buildchroot/buildchroot.bb | 28 +++++++++++++++++++++- > .../buildchroot/files/multistrap.conf.in | 8 ++++++- > 5 files changed, 58 insertions(+), 3 deletions(-) > create mode 100644 meta/classes/isar-events.bbclass > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 026028f..5d5a924 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_setup_mounts" > > # Each package should have its own unique build folder, so use > # recipe name as identifier > diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass > new file mode 100644 > index 0000000..55fc106 > --- /dev/null > +++ b/meta/classes/isar-events.bbclass > @@ -0,0 +1,20 @@ > +# Isar event handlers. > +# > +# This software is a part of ISAR. > +# Copyright (C) 2015-2017 ilbers GmbH > + > +addhandler isar_handler > + > +python isar_handler () { > + import subprocess > + > + devnull = open(os.devnull, 'w') > + > + if isinstance(e, bb.event.BuildCompleted): > + bchroot = d.getVar('BUILDCHROOT_DIR', True) > + > + # Clean up buildchroot > + subprocess.call('/usr/bin/sudo /bin/umount ' + bchroot + '/isar-apt || /bin/true', stdout=devnull, stderr=devnull, shell=True) > + > + devnull.close() > +} > diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf > index b853c88..36cca29 100644 > --- a/meta/conf/isar-bitbake.conf > +++ b/meta/conf/isar-bitbake.conf > @@ -27,6 +27,9 @@ BUILDCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot/rootfs" > # Setup our default hash policy > BB_SIGNATURE_HANDLER ?= "noop" > > +# Add event handlers for bitbake > +INHERIT += "isar-events" > + > include conf/local.conf > include conf/multiconfig/${BB_CURRENT_MC}.conf > include conf/machine/${MACHINE}.conf > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb > index 51f9d5d..304c67e 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot.bb > +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb > @@ -32,7 +32,9 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ > WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > -do_build[dirs] = "${WORKDIR}/hooks_multistrap" > +do_build[dirs] = "${WORKDIR}/hooks_multistrap \ > + ${BUILDCHROOT_DIR}/isar-apt" > +do_build[depends] = "isar-apt:do_cache_config" > > do_build() { > E="${@ bb.utils.export_proxies(d)}" > @@ -67,6 +69,8 @@ do_build() { > } > trap '_do_build_cleanup' EXIT > > + do_setup_mounts > + > # Create root filesystem > sudo -E multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" > > @@ -76,4 +80,26 @@ do_build() { > # Configure root filesystem > sudo chroot ${BUILDCHROOT_DIR} /configscript.sh > _do_build_cleanup > + > + do_cleanup_mounts > +} > + > +# Invalidate stamp for do_setup_mounts before each build start. > +# This will guarantee that this function will be executed once > +# per build. > +python __anonymous() { > + stamp = d.getVar("STAMP") + ".do_setup_mounts." + d.getVarFlag("do_setup_mounts", 'stamp-extra-info') > + os.remove(stamp) if os.path.exists(stamp) else None > +} > + > +do_setup_mounts[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > + > +do_setup_mounts() { > + sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt > +} > + > +addtask setup_mounts after do_build > + > +do_cleanup_mounts() { > + sudo umount ${BUILDCHROOT_DIR}/isar-apt 2>/dev/null || true > } > diff --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > index a0b28e3..480a4b8 100644 > --- a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > +++ b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > @@ -6,7 +6,7 @@ noauth=true > unpack=true > ignorenativearch=true > bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## > -aptsources=##DISTRO_MULTICONF_APTSOURCES## > +aptsources=isar-apt ##DISTRO_MULTICONF_APTSOURCES## > configscript=##CONFIG_SCRIPT## > setupscript=##SETUP_SCRIPT## > hookdir=##DIR_HOOKS## > @@ -29,3 +29,9 @@ source=##DISTRO_APT_SOURCE_SEC## > suite=##DISTRO_SUITE##/updates > components=##DISTRO_COMPONENTS## > omitdebsrc=true > + > +[isar-apt] > +source=file:///isar-apt > +suite=isar > +components=main > +omitdebsrc=true > Looks good! I'm testing it via your devel branch, and I also successfully rebased "Permanently mount '/dev', '/sys' and '/proc'" on top. Regarding the remaining cleanup of WORKDIR mounting: Can't each dpkg-base class register their own cleanup handler in the same fashion? Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux