From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6558372643829972992 X-Received: by 2002:a2e:9010:: with SMTP id h16-v6mr139784ljg.41.1527081982197; Wed, 23 May 2018 06:26:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:1a43:: with SMTP id a64-v6ls2278642lfa.0.gmail; Wed, 23 May 2018 06:26:21 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo2/1gk9WpzSGQfnCwnwac90DGeWx6zf2U1oNj9b0WTMoWuURqQq6Z9uGHWBcQgNxM3KScB X-Received: by 2002:a19:db8e:: with SMTP id t14-v6mr154431lfi.30.1527081981775; Wed, 23 May 2018 06:26:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527081981; cv=none; d=google.com; s=arc-20160816; b=DkCokaQNiixURAKeNcmds4dIEsrk5YlkwBkJz/ieCbX25XeQjXca/TBjA5zLJVIpoO X86L4QTAfA1UsDfqcxIT1GXeStE3+bmi2zwK8pUL8mgrdiNIJld5tlU03CFQeMmswAXX UOXcFpKJTGcA5uFY3csQLJ9Mvth4FTXcTFtFkuEJhYrUQ/rVr2ccot+kF9dW3zwWftJ6 iWXqW43SQbDQyW8iyyRewYrVViTeIeAREJkxvA4HPiyHKTvU1SznyLPNYodmmtnl9NV7 4zJNQqHhBfYLUhV000Uk60eOAPaM5M+tykNHmN7ViDDH37Qr6hLPX1Nmd5or+NdFyVAL b2gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Pm+qxxdfOizfwaVedOKxWQzfOZwM5WMBHn/yZ5AhzTw=; b=VnbrHS7YDjRhOCtXcWlVWpcO1O7xrrF9wS//ew0MkkZjn00jas2jFtiwg8ZCO+E5hM W5T4ICGQJ7jwtv1qwtkrhQEL2Phf5/UvaO0rgrYoQpI1wWKX4dWqc8hwcndvU0znhx39 zg6dqsI6vrckPpshfcTdTrfsTFgFPHlXI3CV61E3e5j3lKHhcX4M1XnDEzX3W0qSClIn j/9jCQZHTEu7Ds2c1+/lmwRvrX+Q4dkpSh97ED6fpoKTNHWGSn4jmyH2TO7WWmPOPST6 sIdk9Gi3/Dgf0wDtzP4thn2K/viuQoMr6fYlX7FbsWFhNvN9zVhvbcvRMPHWLh5bhFVf 6U6w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y205-v6si603663lfa.0.2018.05.23.06.26.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 06:26:21 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w4NDQKaw023278 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 23 May 2018 15:26:20 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.69]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w4NDQKH1030849; Wed, 23 May 2018 15:26:20 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [RFC PATCH v2 1/3] meta/isar-bootstrap-helper+dpkg.bbclass: bind mount /var/cache/apt/archives Date: Wed, 23 May 2018 15:26:07 +0200 Message-Id: <20180523132609.408-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523132609.408-1-claudius.heine.ext@siemens.com> References: <20180523132609.408-1-claudius.heine.ext@siemens.com> In-Reply-To: <3467a5ec-182e-8c9a-cd19-7ad898323be7@siemens.com> References: <3467a5ec-182e-8c9a-cd19-7ad898323be7@siemens.com> X-TUID: F7OpqmsUdD/j From: Claudius Heine Bind mount the /var/cache/apt/archives directory to the original isar-bootstrap root file system, so that the cache is shared between all images based on it. Central package cache is the first step of reproducible builds. This should allow faster execution of subsequent builds. Signed-off-by: Claudius Heine --- meta/classes/dpkg.bbclass | 5 +++++ meta/classes/isar-bootstrap-helper.bbclass | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c8d4ac5..5422b9a 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -5,6 +5,11 @@ inherit dpkg-base # Build package from sources using build script dpkg_runbuild() { + DEBOOTSTRAP_DIR="${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/" E="${@ bb.utils.export_proxies(d)}" + mountpoint -q "${BUILDCHROOT_DIR}/var/cache/apt/archives" || \ + sudo mount --bind \ + "$DEBOOTSTRAP_DIR/var/cache/apt/archives" \ + "${BUILDCHROOT_DIR}/var/cache/apt/archives" sudo -E chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${PPS} } diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 76e20f6..fa68a9f 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -17,8 +17,10 @@ setup_root_file_system() { -o Debug::pkgProblemResolver=yes" CLEAN_FILES="${ROOTFSDIR}/etc/hostname ${ROOTFSDIR}/etc/resolv.conf" + DEBOOTSTRAP_DIR="${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/" + sudo cp -Trpfx \ - "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/" \ + "$DEBOOTSTRAP_DIR" \ "$ROOTFSDIR" echo "deb file:///isar-apt ${DEBDISTRONAME} main" | \ @@ -27,6 +29,10 @@ setup_root_file_system() { echo "Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000" | \ sudo tee "$ROOTFSDIR/etc/apt/preferences.d/isar" >/dev/null + sudo mount --bind \ + "$DEBOOTSTRAP_DIR/var/cache/apt/archives" \ + "$ROOTFSDIR/var/cache/apt/archives" + sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} $ROOTFSDIR/isar-apt sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs $ROOTFSDIR/dev sudo mount -t proc none $ROOTFSDIR/proc @@ -55,6 +61,7 @@ setup_root_file_system() { /usr/bin/apt-get purge -y ${IMAGE_CFG_PACKAGE} fi if [ "clean" = ${CLEAN} ]; then + sudo umount -l "$ROOTFSDIR/var/cache/apt/archives" sudo -E chroot "$ROOTFSDIR" \ /usr/bin/apt-get autoremove --purge -y sudo -E chroot "$ROOTFSDIR" \ -- 2.17.0