From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506467811408216064 X-Received: by 10.80.242.138 with SMTP id f10mr4883464edm.11.1514905091464; Tue, 02 Jan 2018 06:58:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.241.28 with SMTP id w28ls11781396edl.0.gmail; Tue, 02 Jan 2018 06:58:11 -0800 (PST) X-Google-Smtp-Source: ACJfBouI0A1G3s/9T1UQytuDhy+ldldCDPVfW955+BedWAooAtI6qvnZ9Ki8z/B9/7Sxz7uQFbg5 X-Received: by 10.80.151.161 with SMTP id e30mr12096073edb.4.1514905091044; Tue, 02 Jan 2018 06:58:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514905091; cv=none; d=google.com; s=arc-20160816; b=uZvbUFIlOzqgKay35pbHBa0R8I+27mJB491Aakmo2Ft8WuxYMRxBBTzpLfMSAJuwwL B9HbP3Lhf9PUlquHhKwJt06MNSrZJFJfynRgJ4p2U+fyMBYsiMHzdL2XUrmp7nAFUo5U MyFIE3wWOCJ9bjNVggHEbZh0Lys/FORf2gFiLenTqL2WvOS3luQ+BFIgPRAFhEDTbC49 IB71uyKGHV3W00s98U0F4ypg0WJ8KjSNdPcshl8UEpRL1HlzZOgvjQH/4kQf4OTrWa54 5uMI8VZETmnrlnll5ELOPqwRgYlEwvU3Ubs4+gJ+fZSsFnHiYzbM0bn1Icfn3NadtCe5 wV6g== 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=LmSoPsEphPWMhuJbe49JA95wviFOWLuygbn6MpvZSR8=; b=DGYcnsAFML/ryuR6vuBDXdh8Ug1DR3/nnO5At/qFKLhKPTwWwYPa2MFNUPhHfNVV56 7yK5IIuaSjnfvUUFL38gj9zlelApoVv+H+SS9hLZqnJsL9U2ju+nFdxbz0MXYtATTdQQ Lt4Bz4hmXDP3p+3LbR+ZzQuNvfeOoSP79ziiQwE2l4GsN+JQ7lCxvYpDP1ULtgpan/Q9 AUOLckPpDxIq8o5/4e9TLGOiA7pflZ/sxzwzdkA5NeWm2LY800EL2gUKv/drNQR27+/4 kRA+9LWx+8IvZDwQfZVl3VoiSfb3XVDMB+c/yK5ynUWWaPF3AC5Kn7KFXDGhhjGgyREX 2mSg== 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 w21si399090edl.5.2018.01.02.06.58.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 06:58:11 -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 w02Evpwj016822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 2 Jan 2018 15:58:01 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [RFC][PATCH 4/6] buildchroot: Add mount/umount for 'base-apt' Date: Tue, 2 Jan 2018 17:57:42 +0300 Message-Id: <20180102145744.21814-5-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180102145744.21814-1-asmirnov@ilbers.de> References: <20180102145744.21814-1-asmirnov@ilbers.de> X-TUID: NuXWA3sQt5SE 'base-apt' should be avaialble in buildchroot to have possibility to install build dependencies for packages being built. Mounting is performed in dedicated task buildchroot:do_prepare. To implement umounting, the bitbake events are used. This patch registers handler for build complete event which performs cleanup. Signed-off-by: Alexander Smirnov --- meta-isar/conf/local.conf.sample | 3 +++ meta/classes/dpkg-base.bbclass | 2 +- meta/classes/isar-events.bbclass | 21 +++++++++++++++++++++ meta/recipes-devtools/buildchroot/buildchroot.bb | 11 +++++++++++ 4 files changed, 36 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 2da803b..acced81 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -167,3 +167,6 @@ REPREPRO_LOCK_ATTEMPTS = "16" # List of images, wich dependencies will be pre-fetched and put in base-apt. # This will guarantee image building reproducibility. BASE_APT_IMAGES ?= "isar-image-base isar-image-debug" + +# Add event handlers for bitbake +INHERIT += "isar-events" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index c61f9a6..bc8fab8 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/isar-events.bbclass b/meta/classes/isar-events.bbclass new file mode 100644 index 0000000..6ccda99 --- /dev/null +++ b/meta/classes/isar-events.bbclass @@ -0,0 +1,21 @@ +# 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 + '/proc || /bin/true', stdout=devnull, stderr=devnull, shell=True) + subprocess.call('/usr/bin/sudo /bin/umount ' + bchroot + '/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 4d773f9..1fad2f8 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -80,7 +80,18 @@ do_build() { # Install package builder script sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR} + # Create share point for apt + sudo install -d ${BUILDCHROOT_DIR}/apt + # Configure root filesystem sudo chroot ${BUILDCHROOT_DIR} /configscript.sh _do_build_cleanup } + +do_prepare[nostamp] = "1" + +do_prepare() { + sudo mount --bind ${BASE_APT_DIR}/apt ${BUILDCHROOT_DIR}/apt +} + +addtask prepare after do_build -- 2.1.4