From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a19:c78a:: with SMTP id x132mr5781303lff.83.1585230216895; Thu, 26 Mar 2020 06:43:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8941:: with SMTP id b1ls1590156ljk.8.gmail; Thu, 26 Mar 2020 06:43:36 -0700 (PDT) X-Google-Smtp-Source: APiQypJswyOZ2RV3OaQX57eh6gX2phDxH1Pj51iQ6tvk+npit1k2EU6vNeUD/bFCRQRFF4nZU0Qh X-Received: by 2002:a2e:8693:: with SMTP id l19mr2853523lji.132.1585230216223; Thu, 26 Mar 2020 06:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230216; cv=none; d=google.com; s=arc-20160816; b=XQNBOpzqBKOxaP1stf4BSwc0LZ4Y2lRI8eDKrYxuL6Iy829zLVGt02I5B3Q15ISE/z PWtyNMjLSWNJTb/tVEnheY5Hs7JkvLxNw6P0Pj7cIAtftnvm7vU8A92UhVUXbnoVChMx drC7gUzKTMDd6l8X8pbLEB8HoTZde5yIgeSudjARhV2gCOt4b1ZOxWQxiQPx9qi+aIAF NV1qoh6nBrehHgSqDtl4ktVTGCGJhBe4kUK/Xg+5gyJNzIMBp2k/J9swMfYxi9G0O3d3 zG8EPgkpWCsCn9IHXuJsA7EoD//c8OO84qB1PIgIHPpdoD3P5MLgFdWKwWpapfTVTWW/ No4Q== 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=cDyj9eK+YvxkqIkSOFoRR5s8MiyLq9JCu4RBXkzmCik=; b=JRvGAfHXWPqSgAM2GRqP2zqItoI0QIs6JnqFgdIVj0Ij3/DWFz8jC2cUe0HMDCUMMX UoT9yLj/jrl7WdFDjHA9Tn6fQh4vlKIyJNQ1Ixwsyg4+w300UDNpl8zF7XEbQVIAynVy CSkb/iHwfLN76+pZzB5ujLJ8rVzO+MBokvU5uGr8jorysmWYjBd7iDxcqJoNxfk4xGjI YRTodb3dBnXSXHG0mvWaIMCxzVdiuMunGdAXM7YrhVUTa49Z18R8COuG5ppcYxMOG2Ws 8jdyvCjVf5Qw/id3oygDaD2bX2KkTeDGUjpOHhZ9wp8BIVRcTCsKzQTi87N9GnxfbtPB 0E8w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id e4si107968ljn.1.2020.03.26.06.43.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02QDhYwh022539 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:35 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBj031897; Thu, 26 Mar 2020 14:43:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 13/29] base-apt: drop the "apt_cache" feature Date: Thu, 26 Mar 2020 14:43:09 +0100 Message-Id: <20200326134325.8672-14-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: l/KiMC17DS3k 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 07e9e7d..19c9c59 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 6bcc6cd..adaca5d 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 81759eb..be10189 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