From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a17:906:6c14:: with SMTP id j20-v6mr3405148ejr.5.1538482796697; Tue, 02 Oct 2018 05:19:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c689:: with SMTP id n9-v6ls11437962edq.2.gmail; Tue, 02 Oct 2018 05:19:56 -0700 (PDT) X-Google-Smtp-Source: ACcGV62FGPupmGrWhWu+ZTpPTY6EnJnMTTu9aNRqhcJ6VPK0etIBj4YI4dA4cqw1Lj1F4Ao8e3fj X-Received: by 2002:a50:89fc:: with SMTP id h57-v6mr2056878edh.4.1538482796359; Tue, 02 Oct 2018 05:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538482796; cv=none; d=google.com; s=arc-20160816; b=zF1T47zNxIAQxJe+HVv4hZyup6UHKm4MrhNVfITu5smLLd06NkNSpdpEJf09Hy6Ooh 5L0/5tn3Vc2sSkDPhhThZGfyaYf5xSqzbrmpvSppMlNlvd1NpWvthjV7+GkU0m86KI13 hSgX7QqKMAiMN/rLe66s3D+z47fpfTwsV5eAA8lqpZrleN1ksuTiAGaWNDa+N7LLl6Zj G+kIGMu7nxaUB8+hvmEdZ2jZrYZfhPyxgdF7cnEGb1ewtpklaMc7wwLTa188+W9sivY5 bBOhAxIxSQdffU2HKGqdUPfzQSiHEWWz/N3z5G/eWdqUdgS1i4HeeN8Ts/3NpHD+RMCf P4QQ== 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=LkFfvpkh5jcKRJQF4naMO1aLi5wgoNj79IwmrhH7SPo=; b=bqm/QXHYfSTITCuwc9ZsZmrkoKLZ6CH67pasIeEwFVDa1lgjMHCX4IlLoEAo+A/P+i 1jSm8yRZ0NIgTxEwvBYADI5CHkmy6uLY2iL5aFK+oRTpJOpL6Im+hgXklKvib0desKDE xM57V18MRDd5WqWIqeuavQ+GjBsqaPInTikniux05doiuQPT2jYtyp0PHTfwrxH8teiE Z+tBXY30ymT/ZXHa5FuB3pazmpl8FWFQsdw4xyLBgMWLK3nTsqbmC6I/wicAS/F5nDpH Ssh1VWPlbmYS7pMcMmiDIWtjvvKmbEB3be+o1z2N2DFAKmzcACm3VKO72ZGjk16RVUC2 e0Yw== 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 n17-v6si78238edd.2.2018.10.02.05.19.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 05:19:56 -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 w92CJ7Lc013178 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 2 Oct 2018 14:19:55 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 4/9] image: Add cache_base_repo task Date: Tue, 2 Oct 2018 14:19:02 +0200 Message-Id: <20181002121907.18476-5-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181002121907.18476-1-mosipov@ilbers.de> References: <20181002121907.18476-1-mosipov@ilbers.de> X-TUID: yrpso+k1SwsH 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 ea8cbf5..0505a73 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