From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519007876157014016 X-Received: by 10.107.12.90 with SMTP id w87mr33846479ioi.135.1517824799918; Mon, 05 Feb 2018 01:59:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.36.246.68 with SMTP id u65ls1729823ith.6.gmail; Mon, 05 Feb 2018 01:59:59 -0800 (PST) X-Google-Smtp-Source: AH8x224kSHm0E3G0Q9N+lRRNm5Neod9qRC5++YE71xrztrR6lgEQrZX0J2A2w4mEjue1WP98NefM X-Received: by 10.36.57.197 with SMTP id l188mr5316561ita.9.1517824799447; Mon, 05 Feb 2018 01:59:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517824799; cv=none; d=google.com; s=arc-20160816; b=q6fVqVYPJJqLsUM+DgIm19v5kVIR6uHwVxLStHIPUKrDZVA1/1zrvF4VSpC0s/ShDm vxYGKZCiRjp00/MBOXIMw3GqSt/oyeUO9Nb4yJ1PdfPv2fhddl1/hNOYmwAzMrF23isR xiD3MdNXa4B9kn2T8gZbhukOcOja0YrDe8jBRm4g2I4TfNiIbLpKaHyysomzYrhx8jgn eS9uJpcTNwDwPoIgKF5RnGobGZanUzKaXmEvpG48PwCt/aTj5a6S2sH6zEB2zu+Ok4pt rkLJ4z82rqSnZLKwfn/R/Vhf9TpGdp5zsvZsHy5WSTVmOClxFIV5A+pvshw8xo+kf4BC YGpQ== 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=uJty8xX0vwctWCuklsuuBAaynja3GxZJNrCaJ/txn1g=; b=gPo/PDHdPLUJS1AE/iPkDewzV/tA5nhV8HBmeWH8I5Yo+xvYKXemGjgkK2W9fn2bzx jmme7yuQkMQauM4qrERbes8xDXJNu9r/0uY/kfijPjFboWyWQMtgu+kPbLKxgL1s9Gmn 2+VNnwA8oeBmPTnYkBcTifXpkbUFxcVpSRqC9yGO9hF8aWDD0mNH1jbmzRAukx/9Bu/B bR8Q/7PIwcZWlS2f6kj6BdZLC8DtIt5FrFil0R5xV4QS8aaVTePuVUffXYj/zRQnTfPq 7dcefM2bV0VAPbcoYAdooef3CNek0LlFCOjVjg+OW1h277BKqKJxD5+LPA9iEIabhiAB +urw== 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 v144si373043itc.2.2018.02.05.01.59.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 01:59:58 -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 w159xeCB024415 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 5 Feb 2018 10:59:48 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 3/5] buildchroot: Enable isar-apt Date: Mon, 5 Feb 2018 12:59:29 +0300 Message-Id: <20180205095931.23903-4-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: 6S1xSQOrd+pX 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 + [ ! -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 -- 2.1.4