From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a1c:b603:: with SMTP id g3mr6057540wmf.133.1580226193413; Tue, 28 Jan 2020 07:43:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:288:: with SMTP id 8ls2697079wmk.3.gmail; Tue, 28 Jan 2020 07:43:12 -0800 (PST) X-Google-Smtp-Source: APXvYqyCcjpNjdHjowZJT8rh9FtPpRAJXLr7j9PN/cOy+JcUBNqIqcSyM5k//xvIccYRzKjBR7TV X-Received: by 2002:a7b:cae2:: with SMTP id t2mr5839525wml.180.1580226192745; Tue, 28 Jan 2020 07:43:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226192; cv=none; d=google.com; s=arc-20160816; b=1EQg9XDjoEwT00ovJ4k+EpiYhFziuMCirM7iWFGMGQE48mM1soiqnw+duPQhzgAY6N Whj7u3lm5Hq3wdnovQkn4dZRlXB6cXXAQp2eqcSJdfzNwWfC9L64xCGomSL2Pnv7j+Sl a35xUzIRSBOUhBeted1zQQfUMG8pIvY11aEGKW8AYK4CxToyj5WA0wURpf7zl2UYpDno w45WZfkQ9awKi3E+o/h+YuLs8DT5oIZZn1UQ7xvHI2bgRVvu4XXjjaJ7GP7Rkjk4Q/d3 fMT5phtqmPtjjbcBDCY1qsGjbkUMhtlFMHjzrLZ97PK15VlKQXFx/RwtmRwEeur9upnf MhwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qxrMKWiVJ2NZozWtdcZoDH/8WFRToKKR6+dhBJV28Fs=; b=dOHsqrhDENE+/+ntg6+mdlnYLhdtUmeoqbiBPjAEZXS+QI/NQJPRUiJqgpw5eXjxpy sIzLhy9xgfaXlWjWARZiesjFF5byHUWpBA2dfXujPWSwN28Vr1iJorjiPWlfW9Qb1Q4E sPycyQybKeSLQ04x1i+XarFs34IwUq1ni+JMHXC5UGVtp9x4DU4/Lt8Mlw27kRrimIyk csxiRgroEgp83MC4sw8Z0QRuGlGDRbH5rtaHfrXIhUob08j0aAHz4Ywmoirgt7dlMKeW xT2CitvW85hoZrsBX9VHoFbQSh3/Sug5s13VjdsN8WQ+clCiQhtPp+Xg9aiztoStmyxx wMMw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Q82yWBfL; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::429 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com. [2a00:1450:4864:20::429]) by gmr-mx.google.com with ESMTPS id d191si114633wmd.2.2020.01.28.07.43.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:43:12 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::429 as permitted sender) client-ip=2a00:1450:4864:20::429; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Q82yWBfL; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::429 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x429.google.com with SMTP id k11so1871193wrd.9 for ; Tue, 28 Jan 2020 07:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qxrMKWiVJ2NZozWtdcZoDH/8WFRToKKR6+dhBJV28Fs=; b=Q82yWBfL9rkCQIZGYf0aMcyFQJ3jiV2IVFE8evVXqb70tVy+KJr38wpLt2Y3PE1piy Me/dChsO1NEGen2ntluMPeVw0yYBtOqM7WcWayaKr1gdr988EOuLGHFy9o+s9cWM/WeY 3hlbDycJJGYEd4CgFKZkxUqrOmobMEptNVRzrcbhpBH9oqTOBzy65ce1sejzumxu6YaY Tx7S0ZY2sjOv2bg4PoEUw/3k1D8QdBpJ22+Wr93w72hj1AidyRgldGBfaTnYXEJV0UVi ca97iIhkYpP22cxoQCOh7rLVlQFbahWDkDU5sBbP7G7m5AovQsCjR4BYpEnJFr0XV/ZS //ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qxrMKWiVJ2NZozWtdcZoDH/8WFRToKKR6+dhBJV28Fs=; b=UGkabLD+p6p0AavVf6on/f0gJTt8v0ZvoOosgYb5xzu1o93s5qALVeacvsP8CZmESd K+F7/u2MlkfLxi3j/akMafUk6TNBiXKs+f4Y2y1bkS9MWnLFibBHxElEobXyW0OMOIPZ b7A1ZDfw890VVPvQXzltve3IXMQrPlOcVr1iAR5ATWnZd+ZtUrHzEJCR4stgnDQc97+s guy7Nnx3YUScNeaz8BI0G2uYR6ZEiOe0kpNoQri0QQzfjhcjBjnG6Gxqrv7YAj/4S50b d6SX5kLKS8UuI+Xh3yHCnR1ggCsynYuH9YiP+vUGPqnwBqbJdUf20iYwmZA/v1a10+47 4s2w== X-Gm-Message-State: APjAAAXryt33dxBohfn0zm5+KZLjqJO1L1ZDXlQwd8wI7mcUyw8zMfCk oeIY1zRjR1IVipk8BVf1juFIPxeD/vU= X-Received: by 2002:a5d:44cd:: with SMTP id z13mr29879232wrr.104.1580226192141; Tue, 28 Jan 2020 07:43:12 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:43:11 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 13/26] base-apt: drop the "apt_cache" feature Date: Tue, 28 Jan 2020 21:12:00 +0530 Message-Id: <20200128154213.22353-14-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: IA9SVMDwe9jl 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.17.1