From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:adf:f38f:: with SMTP id m15-v6mr230166wro.16.1539276809313; Thu, 11 Oct 2018 09:53:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:9645:: with SMTP id y66-v6ls1346457wmd.17.gmail; Thu, 11 Oct 2018 09:53:28 -0700 (PDT) X-Google-Smtp-Source: ACcGV61Lcd8q68vqwmudBHvt4yYbe63MRsJ5EuyT2crFo9a812S8ZE3oON+q6pp4fdRYpHrbVixP X-Received: by 2002:a1c:e54f:: with SMTP id c76-v6mr272126wmh.2.1539276808815; Thu, 11 Oct 2018 09:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539276808; cv=none; d=google.com; s=arc-20160816; b=OpDniP2HU3Sz+FKA+eXZ7CZieaCY2yYnHZs420Pbr7UGD9ezElNxhT6xh842JEGHHy yaMxY6W8qR8KAj6BeH6ViaelGMz5KIpCKBsYxG2pAdHTREBNiO5pLW1nS/0jJEOZVumf iX/oBkDmmcfUqKWPfl6+buUDzPSFLLyrfkyGAtvbizxKGqCABiVnmP38BlEeDUf+tZfd R5tBn2usUvMk5X6VU/IuN0O/RxL8qS8St356nDb7oIgJ3SEYncfutbpkJ2zypNnDiByc FNUfzUjvWhejZ8EM3yVnlTgfZ8l9/33afbK2168xwefFSIySD7oy9hdiTfvy3PkwIP0/ JmPA== 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:to:from; bh=/Hep3tke8aave3VzGMMU8n4PH9SHyD7MR3Z+DAp+msM=; b=OGYW1VpaN6xRZ5Fj56FZSFANbWeMkZwPlevPw5oImn856Phpl35TwVOwCnvIeEYmAq ioc5a4hCX+1AEpqIKYphBYbMAMH1oTXcMn4gYEW3Gg2Ii0Cafx+7l2LozUmp0tC04QNS sZHvRw8yeiTHNguvb/bJnDxgxz3E+jcxHyO91PEuZ1KBux8pFsf+fGlUfnT2khvyMau3 jD4b8oW5FnqoCndxWqh4/WYIMnenpzsIdMTNsjKlX1iDxUiOUap6EIosjnE2i+2fEFaF fAT2TEemk4aKTi5m92TrS5WMaiID7tX+16qCK31pkpKOk/EVETEu00twEfTkr3pW5qtu wskQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id 191-v6si1117263wmv.0.2018.10.11.09.53.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 09:53:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w9BGr67b015654 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 11 Oct 2018 18:53:28 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2 05/10] image: Add cache_base_repo task Date: Thu, 11 Oct 2018 18:53:00 +0200 Message-Id: <20181011165305.1622-6-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181011165305.1622-1-mosipov@ilbers.de> References: <20181011165305.1622-1-mosipov@ilbers.de> X-TUID: Qbvwbu0/1EU3 From: Alexander Smirnov This task puts all the packages using in build to base-apt. Signed-off-by: Alexander Smirnov Signed-off-by: Maxim Yu. Osipov --- meta-isar/recipes-core/images/isar-image-base.bb | 3 ++- meta/classes/image.bbclass | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 4899593..bf606cc 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -41,7 +41,8 @@ devtmpfs /dev devtmpfs mode=0755,nosuid 0 0 # End /etc/fstab EOF - setup_root_file_system --clean --fstab "${WORKDIR}/fstab" \ + setup_root_file_system --clean --keep-apt-cache \ + --fstab "${WORKDIR}/fstab" \ "${IMAGE_ROOTFS}" ${IMAGE_PREINSTALL} ${IMAGE_INSTALL} # Configure root filesystem diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e948dea..05ff06f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -123,6 +123,27 @@ do_populate_sdk[depends] = "sdkchroot:do_build" addtask populate_sdk after do_rootfs +inherit base-apt-helper + +do_cache_base_repo[depends] = "base-apt:do_cache_config" +do_cache_base_repo[stamp-extra-info] = "${MACHINE}-${DISTRO}" + +do_cache_base_repo() { + if [ -d ${WORKDIR}/apt_cache ]; then + populate_base_apt ${WORKDIR}/apt_cache + fi + + if [ -d ${BUILDCHROOT_HOST_DIR}/var/cache/apt ]; then + populate_base_apt ${BUILDCHROOT_HOST_DIR}/var/cache/apt + fi + + if [ -d ${BUILDCHROOT_TARGET_DIR}/var/cache/apt ]; then + populate_base_apt ${BUILDCHROOT_TARGET_DIR}/var/cache/apt + fi +} + +addtask cache_base_repo after do_rootfs + # Imager are expected to run natively, thus will use the target buildchroot. ISAR_CROSS_COMPILE = "0" -- 2.11.0