From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517546778931232768 X-Received: by 10.46.25.221 with SMTP id 90mr2769724ljz.17.1517746098381; Sun, 04 Feb 2018 04:08:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.46.12 with SMTP id u12ls509029lju.4.gmail; Sun, 04 Feb 2018 04:08:17 -0800 (PST) X-Google-Smtp-Source: AH8x224TsQFr6ioJqYRvHJpj+Qqaz142fqXyFW7whBwBEIFYs37o/X8sLIYppQjo2yVGxl7VT0Uj X-Received: by 10.46.42.66 with SMTP id q63mr1260588ljq.37.1517746097506; Sun, 04 Feb 2018 04:08:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517746097; cv=none; d=google.com; s=arc-20160816; b=hLxFUwwsZPrMc6nl+je2jaD2Hj36Poyw8MCasCtMKbMy8QNY51NVzXab2xBgN99DZz LPtqiCTczstHyonstlv7/77j6QcLf4EFEuRMlLzj7IZ5XWxd2WV1dKjklhDDuRUWZx4z pe5PPqN6ZMkS91txIdcNStjrO3//wYYXR7lmd/QC027RLgSeoy5cE5VolkhtPrPtvOKR 4Wd8W/vp3u1pBFu859ZNwZQnwXOWE785DCgy06qeTPs0SmOxQcHspfSNK8np5+RZNlbu HxEVNDkM11OrGFcOyt8MIWFGQXzP+AL3ip5nYS5xzu6cOwd2znLAWeSAhtb8c+ioG/fQ IC0w== 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=UyCXtXCG4PlnGKXzIjUKRlPwskOahYlyFJqo9z4fO08=; b=Ey022dEcQCftozWQSvpSk7DoLXhqGQK9dl12xzcqUT5t8NxLpNHtbkrp2tbaAd7+a6 xGGeMrB0AZ6q2blFI6rkGrGvTSZTqssE2HAfLGmdxKzQ6UOmDjOhRxGW0Z5g+Q93n9z4 QtWsUC4Ok+YO3pNGDmep1yrty0L1x0B80ZtGmYMuWyg+WVAxcODWDjTIv/p1emZf9iDu PFoFBOhVZ5u0gENN8XKxd+ruol7TgGzm2KSMsFIYjMIWdjMidaCKU+fC1xj1ZAI3jPKj MDPvqgjEPqMenautHRZrbXRsDwBlg5jU4wCjnhn+BsyExkRrgxGVZm+MYt3/oPKQ8p4m MREA== 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 m2si402538lfj.2.2018.02.04.04.08.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Feb 2018 04:08:17 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w14C8G9l028961 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 4 Feb 2018 13:08:16 +0100 Received: from [167.87.162.90] ([167.87.162.90]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w14C8EiP023077; Sun, 4 Feb 2018 13:08:15 +0100 Subject: Re: [PATCH 2/4] buildchroot: Enable isar-apt To: Alexander Smirnov , isar-users@googlegroups.com References: <20180201112944.7877-1-asmirnov@ilbers.de> <20180201112944.7877-3-asmirnov@ilbers.de> From: Jan Kiszka Message-ID: <625d5ca7-af13-37f1-a59d-1b2535b36808@siemens.com> Date: Sun, 4 Feb 2018 13:06:56 +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: <20180201112944.7877-3-asmirnov@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: HuSOoJr0Hvm3 On 2018-02-01 12:29, Alexander Smirnov wrote: > 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-isar/conf/local.conf.sample | 3 +++ > meta/classes/isar-events.bbclass | 20 ++++++++++++++++++++ > meta/recipes-devtools/buildchroot/buildchroot.bb | 7 +++++++ > .../buildchroot/files/multistrap.conf.in | 8 +++++++- > 4 files changed, 37 insertions(+), 1 deletion(-) > create mode 100644 meta/classes/isar-events.bbclass > > diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample > index 2ae43e7..fc760ed 100644 > --- a/meta-isar/conf/local.conf.sample > +++ b/meta-isar/conf/local.conf.sample > @@ -158,3 +158,6 @@ IMAGE_INSTALL = "example-hello example-raw" > # > # Default parallel jobs for bitbake: > BB_NUMBER_THREADS = "4" > + > +# Add event handlers for bitbake > +INHERIT += "isar-events" > 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/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb > index 51f9d5d..cb90148 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot.bb > +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb > @@ -33,6 +33,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > do_build[dirs] = "${WORKDIR}/hooks_multistrap" > +do_build[depends] = "isar-apt:do_cache_config" > > do_build() { > E="${@ bb.utils.export_proxies(d)}" > @@ -58,6 +59,9 @@ do_build() { > -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" > > + [ ! -d ${BUILDCHROOT_DIR}/isar-apt ] && install -d -m 555 ${BUILDCHROOT_DIR}/isar-apt > + sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt > + You likely also want to update the cleanup hook to unmount that again... Jan > [ ! -d ${BUILDCHROOT_DIR}/proc ] && install -d -m 555 ${BUILDCHROOT_DIR}/proc > sudo mount -t proc none ${BUILDCHROOT_DIR}/proc > _do_build_cleanup() { > @@ -73,6 +77,9 @@ do_build() { > # Install package builder script > sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR} > > + # Create share point for isar-apt > + sudo install -d ${BUILDCHROOT_DIR}/isar-apt > + > # Configure root filesystem > sudo chroot ${BUILDCHROOT_DIR} /configscript.sh > _do_build_cleanup > 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 >