From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a1c:e28a:: with SMTP id z132mr12117022wmg.157.1580481004948; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c3d1:: with SMTP id d17ls4291475wrg.10.gmail; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-Google-Smtp-Source: APXvYqwmZ77QQwvoxR+Iu0uco0drOcReraMjtK4yYgiYgfhHcwbbgoEyQ5T0JJGI5W8aYPFEjlB4 X-Received: by 2002:adf:f491:: with SMTP id l17mr13462617wro.149.1580481004187; Fri, 31 Jan 2020 06:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481004; cv=none; d=google.com; s=arc-20160816; b=bVWFbi0uNp/7TYJJGeNKuO0T48PH7+9droRGs06PdQAZgnfRHHVBKnxTeVOiRJfX3Q WIDbwgMYCnfSb6zY70rJU499xedsouvl2K5mieOzDUf6ry/l52mVCqPqn9lB4vL9YT05 VHByriORr2BziDRBU4/l+CMLU3ZnJOzCD9ByjK9TpWrfDSK8zA3WE5o7Njv2GeyFBir5 YNgtDpc18LYJ0iLapBd2wRCYIVjkYnkRGtkWVxmQe/cR+nmaVBQPYkcdZcpmGS4JU+eV la23L9GlN/dh7LoIg2oQHm+Pny+Tc9OdWK/eEQN3Arb24kLuQlcnMI9ET9WvKYtZKSwx Ap7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=HwuiEI8FIxSMkxx0j02jRr2ePqCqrPMoqBRHdXoYqp0=; b=vH4R7MN/ZEHj4UlcrSh7K9tgkPpEeecj3NWQYdHHMH0wRqt+Har1FQK9O8YlvSmX1l m7Ry74H2ry93QMadPFYZ2vDEH9pN0AgxbRkxMkYDDRfk4uhPbM5j3uC9wdVnGJxp+Hl2 7weOd/QYpA5libBVmDPqXzyY8ajKpMO7w8nIzbSJG9SYuo68Xy0M3e9JdE5wQH3BLDsq huylovoWAZncE8TE0gD9SyXVzV6ykUqsYj2a2C8Ne1o/fKj9qf0x4tuJHOBjymhgotC7 FClneUVewtfkUTPk7NkPIMtEFoHe04vftOxFZ+TJM2mcLuydVLbhA2Xo3hBqJ15OWcnm U1Tg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y185si382465wmg.0.2020.01.31.06.30.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:04 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 00VEU2Wf022745 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:03 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RR030231; Fri, 31 Jan 2020 15:30:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 13/26] base-apt: drop the "apt_cache" feature Date: Fri, 31 Jan 2020 15:29:47 +0100 Message-Id: <20200131143000.14873-14-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: DcdKtDfua+5r From: Henning Schild We now have all debs in DEBDIR anyways, no need to conditionally copy them out of the rootfss we create. Signed-off-by: Henning Schild --- meta/classes/image-cache-extension.bbclass | 4 ---- meta/classes/image.bbclass | 2 +- meta/classes/rootfs.bbclass | 10 ---------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/meta/classes/image-cache-extension.bbclass b/meta/classes/image-cache-extension.bbclass index 07e9e7d0..19c9c593 100644 --- a/meta/classes/image-cache-extension.bbclass +++ b/meta/classes/image-cache-extension.bbclass @@ -21,10 +21,6 @@ do_cache_base_repo() { "Try it without cross-build." fi - 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 diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 725bc04f..b687fcfb 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -60,7 +60,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "copy-package-cache clean-package-cache finalize-rootfs generate-manifest" +ROOTFS_FEATURES += "clean-package-cache finalize-rootfs generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 4e145400..557756c7 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -9,7 +9,6 @@ ROOTFS_PACKAGES ?= "" # Features of the rootfs creation: # available features are: -# 'copy-package-cache' - copy the package cache ${WORKDIR}/apt_cache # 'clean-package-cache' - delete package cache from rootfs # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} # 'finalize-rootfs' - delete files needed to chroot into the rootfs @@ -186,15 +185,6 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'copy-package-cache', 'rootfs_postprocess_copy_package_cache', '', d)}" -rootfs_postprocess_copy_package_cache() { - mkdir -p '${WORKDIR}/apt_cache' - sudo find '${ROOTFSDIR}/var/cache/apt/archives' \ - -maxdepth 1 -name '*.deb' -execdir /bin/mv -t '${WORKDIR}/apt_cache' '{}' '+' - me="$(id -u):$(id -g)" - sudo chown -R "$me" '${WORKDIR}/apt_cache' -} - ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'clean-package-cache', 'rootfs_postprocess_clean_package_cache', '', d)}" rootfs_postprocess_clean_package_cache() { sudo -E chroot '${ROOTFSDIR}' \ -- 2.24.1