From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:e808:: with SMTP id o8mr28547473wrm.8.1583877405394; Tue, 10 Mar 2020 14:56:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:afd4:: with SMTP id y20ls2223066wrd.5.gmail; Tue, 10 Mar 2020 14:56:44 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvxSirRn2JPQuOKRCnCgTuXQ+6+nhvtaI5g0nSb7u6EBH7ZKHrW/uWuNnfDf5/aLkX+Jb4K X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr31166768wrx.25.1583877404916; Tue, 10 Mar 2020 14:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877404; cv=none; d=google.com; s=arc-20160816; b=T8u3SQgmH9ij8bUCwOsWiDBmeuIT7iEttzZmJlgXBA6z7ANgwvNMjTMlBhZbNgSczK n7erBRPA4fDEZDTA6JPnOEeWHnKYuVuL0npkJoUjJHPfwZxkInBOhkZBmF0btmesm4U5 1KRNKft2451no5Idg0AoVe3/Ww7Z520iwwkEy0dtLoDldharpjvbPy84y/vhTHAzq/WT fpG1HnPH/zMxCTUSpszFaKoxWV7Gp0eQZp/4ZiJHU32vi0bl48X163s4kw4N2PaVte8l fpkofXhkK6guANv6YzQx0laECPzXiyk0HJFgjhCzGq8lEyFCuxGavErEPsMcVOnz+l25 I1Tw== 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=pgxREvlbwcXFVUXOc/HBx/Y4Z3tLIeo7SbYB+jJQiaA=; b=Yipy3a0LlX5EQKxjZJVuN4iMsEF5AwY6f5CNPCMfpIGvht90BQ0PGemLsqRoq2brSL /Wg/+eTg6yRhmcDUjAPhuxFKGSVVY9WfWbXTpNv56ZF3iT+yzdxfaBb3obNU5S4wx2nk 5wMZHmAaIBK4OvjA65hNdEz1FkocU2x2wrYOj81K6jXQNKp7eesKAEYZiI2NwsRT8NVY hQ4polTAbR2JQiKhwoU6CtA9Vg8/cTAT0nxin6pUTaWFoJQ7c5okxOU6eeuZuGkFE57o I0Tg6/KzZmHjHbTS1z2OYD4UV3au1NXXvv5/lUK+6Y/7gah9DwDqhmbtA1PkROjR5ZJy ZkWQ== 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 w20si201096wmk.0.2020.03.10.14.56.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:44 -0700 (PDT) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02ALuix3005828 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:44 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5v026985; Tue, 10 Mar 2020 22:56:43 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 13/29] base-apt: drop the "apt_cache" feature Date: Tue, 10 Mar 2020 22:56:15 +0100 Message-Id: <20200310215631.24859-14-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: MASzAUgtdTN/ 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 6bcc6cd2..adaca5db 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 81759ebc..be101890 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