From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519007876157014016 X-Received: by 10.25.233.24 with SMTP id g24mr88193lfh.29.1518100644014; Thu, 08 Feb 2018 06:37:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.114.17 with SMTP id n17ls472557ljc.14.gmail; Thu, 08 Feb 2018 06:37:23 -0800 (PST) X-Google-Smtp-Source: AH8x227gKGbWbeE7qOrTnzdXt61rrf2ApKIjCqGxuaD9MzKFDxF5cnMZ/VmCjZfLIfs/CXD9aL5Q X-Received: by 10.46.101.4 with SMTP id z4mr81175ljb.12.1518100643514; Thu, 08 Feb 2018 06:37:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518100643; cv=none; d=google.com; s=arc-20160816; b=v9Y2bt4wSeksU3OL/Ap+/X2gdcWjxV+mK3XCw7EeaYWMEnil2YX58aTD53a6gBznyF 7hP8YMjM1C+nbo63ehAEWXkAezWBLxdWBoFGJD1SdBpYrgFHJ0NyVSYBVmzWiThp3SDe AXcjdawu+Qloxc7hmM5rg2kFpe8YU/6ugS8NZjWktLcob9+VD+1cQVLa6NafpXECxYu+ 81NKGWVa9ivgD3LCCsJR0XvCUnbuVoKOZPbgG+P7XA7IGrI0LMaantr6iCTTxB/SRu5v UWfPky4FWaWtq3JYpcbcEig2SbdthlqmZ7xidSAcXfzGd26hJmRTAI8kYrz74c13W9OC nETA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=1RqIeuWNdAbW3WOTeCJFDcwLyRXHTBrDeHcJ1EL813o=; b=P/NIITReorNw5FnmIWCgXE+d6+0OF1m3MrqDg7FuJWlXjk6SnFHADnB73q/GCfhqEQ cEwprCW/NIFme5A46EAVinRayiARP5py6XDQfafPnUQQihKs5qdWJL6GPvu25o22mCZX ndLgLC+wOEhGALi9Jx/XIkOIpWTUIR3wI4f24pg82XthlbxwtfRxQVbnskD9pMZ5eUT3 Ow/e1IJrvSSfMk8pxaVaDk2K0B48w2C7+GqTOK23WIMsHOWTSq8d4wMfIsBAUttoKXvs YBVdXdLxk3cfy9mTRHdf0BSv1W+kD4f5INscG51G0PHwr4Izu9FI1yYgT/z5B1LtW+Qj hIeg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y16si6114lje.2.2018.02.08.06.37.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 06:37:23 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w18EbMND013479 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Feb 2018 15:37:22 +0100 Received: from mmd1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w18EbMkE024958; Thu, 8 Feb 2018 15:37:22 +0100 Date: Thu, 8 Feb 2018 15:37:21 +0100 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 3/5 v4] buildchroot: Enable isar-apt Message-ID: <20180208153721.35d2bcc1@mmd1pvb1c.ad001.siemens.net> In-Reply-To: <20180206135725.28502-1-asmirnov@ilbers.de> References: <20180205095931.23903-1-asmirnov@ilbers.de> <20180206135725.28502-1-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 10U3QQVWpme7 Am Tue, 6 Feb 2018 16:57:25 +0300 schrieb Alexander Smirnov : > 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) I would suggest to drop the hardcoded paths where possible. Imagine i had my sudo sitting in /usr/local/bin/ or similar. And sudo internally will take care of its own PATH so the /bin/ for umount is also not required. Another use-case could be a wrapper around the actual sudo where people try to handle the sudo-problem of Isar by having a wrapper that uses a whitelist of allowed commands. Henning > + > + 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