From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519007876157014016 X-Received: by 10.28.111.148 with SMTP id c20mr237379wmi.7.1517925474593; Tue, 06 Feb 2018 05:57:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.184.10 with SMTP id h10ls3185302wrf.0.gmail; Tue, 06 Feb 2018 05:57:54 -0800 (PST) X-Google-Smtp-Source: AH8x224s2I20aijwHM3q9WrLL0SnW+F4L9RrWHoZEdDekH9wpXw2/rzpc+22icul75Kr3bqIHBvU X-Received: by 10.223.175.238 with SMTP id y46mr277425wrd.9.1517925474011; Tue, 06 Feb 2018 05:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517925473; cv=none; d=google.com; s=arc-20160816; b=V6ni0w0fRJ4U4IoqLqpYIgRxOLpVvNHjwIJBCU1rFavRi3San1I/eom8XZVo1GcqAt AinAoPicIY8t+PraSSHRGUj3tzxqsPcUn2ojdzeVIG+3tvwqLA7FKMk8yUhEJ00IlD2L BTK0C/cZpDLRnb2NkEUyEdzva0UuIxgCOaB55thJ4QmS3hxP69Zzm87pWg1LRtW2kY3i HAOUySmOOszYZt5MTGJ8jqR/1/Mb4LyAGAdJrF1LD0cER00lQydZwG4bEMpwaNjC3iog whs/5FMfRFiDazqjp6QUgZIhFnrm1+Dod3iXuIItqryoZW3SDhR0GML/phA5R/JFSyX7 Yd4g== 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=xqUSHlolXsG3axSSFSD6DL6oxPhTPUU8PrtyTRVBj+8=; b=XpXDKkklCXWmEB8SNMVFE5ABVpgZR/WnAEUheLitgB9IGRUgv5xbwtYoKo3yInPccL 7pILQJJNfgsFnBZfT0eaXQbZbExzXK//pMGcq+0XujIrQmBiY5uEdCfaVpgKrRq92YSj x1Ms786n9cWe13PObJOiMlrCne81WgR6t9cZtAUU9ucAx9cMkB/xjhfazj5omHn0vmq7 Z0x8JmnfLNG5wwgkQmUZ8CtRJ+fVAbG/j4Esn3/OiCxbNfL0fUBOCqlsnYK5Vf3nigYm 8a6RmxHPMA+s/ej7mqO1IEXIfGL3N2s80AGhJIND8lUG8Thl1XRMxcsaktx5n7WbX2dW 8wGQ== 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 c11si818743wrb.0.2018.02.06.05.57.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 05:57:53 -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 w16DvX4a029312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 6 Feb 2018 14:57:41 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 3/5 v4] buildchroot: Enable isar-apt Date: Tue, 6 Feb 2018 16:57:25 +0300 Message-Id: <20180206135725.28502-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180205095931.23903-1-asmirnov@ilbers.de> References: <20180205095931.23903-1-asmirnov@ilbers.de> X-TUID: GuL4ptpKuOTQ 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 -- 2.1.4