From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:adf:eb09:: with SMTP id s9mr30909552wrn.61.1576497015822; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f403:: with SMTP id g3ls6238963wro.3.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqzcqCQ8uww0fsGJ3UyQgAox3ofI2VKNH/GN4Or99kCiFoB7PvIq8BK2ZGag7OPEw1Ut3qqz X-Received: by 2002:a5d:6305:: with SMTP id i5mr30364712wru.119.1576497015486; Mon, 16 Dec 2019 03:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497015; cv=none; d=google.com; s=arc-20160816; b=cuYokzL/6LJkc9zmOhY4yglAa/cEytiGtWHBWz+Gkv0669z/SYuadbpuKLBgXrIQq0 gngAr8lCx4qKemSMVChYLy2I5uJ3TGaY0L7VLLOC1PxofNJshew/GpZkXRV8WI5JCY9+ DKS9hN1+IDxQwYbPcldNYn2o6Y9pS+2vePfug8HvbPBlKgEZXd7Z1VVq56+b6zzzauxN 7N8p36K/bxj/NOjsWKOlEN/agfzPLon2cEsl31c3y95ZJtaPdNyfs/4L8uORqJ5KEINQ kZkK0sXaIlSVVx6MKFf03Rx9dlJy1HLiA/H7wA8NNZWyVhT13Pr2GlrzZNK2S9/htWYL ZbMg== 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=IIEaTW7bgIxJBiKP3GFUzmOigh47AWpAaj/2KmZZbMs=; b=KNUXEctFVXjFjRfwYZBTbEQNaE3joLVhC09go2TzMFwOB3cxIK2gNNRSzeQgevDLbf YzdX//ZPyCCo+phccsAc13kx/7jzG2xCX9FodT6YMEuE7pZkvOLNxZeGCYawuCba00aD wz2ATVTyx+TbcbjiXoY1rvPcZ96gp040xzTtsFiiD8W17sYBTxIFjRVIto5+gPEyw3LQ mGgbf3g00nurKRbN8sVOQSKoaKOBudZB3S3AGbmPVeOnBYFfcq1mplXzlNqMS213xALA QLxw7+ZtpmBoiwNwySiYhgehjXoIdLfjmea6KwUpNznPatnSAsauv+3hZAtD9yeehlJT uSgg== 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 y185si549772wmd.2.2019.12.16.03.50.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:15 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xBGBoE3M016932 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:14 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWY009084; Mon, 16 Dec 2019 12:50:14 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 13/25] base-apt: drop the "apt_cache" feature Date: Mon, 16 Dec 2019 12:49:59 +0100 Message-Id: <20191216115011.17664-14-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: B+0OAA71I7pM 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 725bc04..b687fcf 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 eac553c..6d4d42c 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