From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:ac2:5dd5:: with SMTP id x21mr6746006lfq.156.1572282097424; Mon, 28 Oct 2019 10:01:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:56d6:: with SMTP id k83ls337521lje.16.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOkY3G5CUu1DDFEJQC1gWTS3ILwowXgyhkxofbsUy00PmAl8SjFxKdAsfxRODOLmHAjtJK X-Received: by 2002:a2e:9a9a:: with SMTP id p26mr12329413lji.164.1572282095972; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282095; cv=none; d=google.com; s=arc-20160816; b=SVE3UmE+eXEcCqgSCDx0Zba+P62b1UXjmG+GBvmMAVPzxS0Mnun5VwUzWjw5y+GZUp GGqVRAl5pQIoeJSSQZJx6gOnKgCI8YDEVGK0qAoSUwYE2V6twI77kSd8RvGegadkaPY2 9WeJXDYyfna01d11yPLt5OLVX3tLpF3pvR1JM2CJqPZHqA3s9s1El6MSIqjWxuWO4uOh OHlJ4gkKLNpYzRdf4xYXWyNXdoIY5NxkkZauZ6rAcqiCaG121ANopLs+7hHOk/ZoEUkR JTxdEY2PiMff2Uoquo3MHk7KKkzmzh8jRLFYx5spNDjg3OufCKQAi4i9jsiZTcrt7eEa Swyw== 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=KsvJ3UAL39YNXExsHaTyUtHgxqaqrUVfiVHuJVUAeEg=; b=UQsSxW017LoUW77qYcjya2W2R7h1GL5u1tLOnhybRH9rzukaawUFhOD/PGpAZqX0dp f4E0tqO1Oz007SrcgDrz09gRj7DZbhGO7nUJEmW4hurV8GNTvcAMhAlChXAYczqbfcxN JYQp19IRyIqFEznECNX8/CXZ6EHPdqrmp4MONOY1rDjdOPK7HU7Y+AcZQvzTi4u5Kgo4 BHr2DYkBh3sRPNvd7WeSIcZ1Bo6L7m3EcjXSyQ8tLxa0UoYHZwnYVzTw8iu+pBrMa3JW LzuJNIj85VrmlUqPJxenCi+SL5bZSlba0DR8W1HnePUElCHEh4iE5bVC/V6HwWsL+eEp 33Fg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id k2si616289ljj.1.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x9SH1ZS4014528 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:35 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPH025390; Mon, 28 Oct 2019 18:01:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 11/17] base-apt: drop the "apt_cache" feature Date: Mon, 28 Oct 2019 18:01:26 +0100 Message-Id: <20191028170132.28072-12-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: w9n9wJJ+T0pa 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 8384b71..eec36e5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -61,7 +61,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 845304c..b8629d8 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.23.0