From patchwork Fri Mar 7 12:25:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4080 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 07 Mar 2025 13:26:06 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 527CQ3In027288 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 7 Mar 2025 13:26:04 +0100 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6e8cf10d1c2sf37374006d6.0 for ; Fri, 07 Mar 2025 04:26:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1741350358; cv=pass; d=google.com; s=arc-20240605; b=FDC7DbSLPKmhLrOw208yIstOJl5BaSNivlCnVmNNFGTB+6LlkZFPos7+4f2XTQ0U/x 6a+IMJHq3bSLHibyrUJbxqz5YW77WXm7P+df7PIgggNnJ0zQehXaiYxSIzFcDj9FivbV loD0Qje173Mq8kohriPPVmeTBi0b/y96w/56Xi5gN3wisxGP76RTJcPa9baO4wyEK5j/ 0ZQNdnXCSte5Ojerf07/6QE6LA51J6gcKBvHEa4rJMaQwwbYBegRfkTgZsws6j9tuhQj KbCCUDegJ3ItR4T1LhqdltXfL9F9BTIBa57f2p5EKVOxhxI85SB3JOX2XFY70094GgHq PJ4A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CgaPUpEs+LjOvJ0n42kgMiR9qtdNHF4+2EkRtdQk2fM=; fh=YoGge3q8X6bMmoPckcJwRHQo7DnzAx/yTplzsbAad7k=; b=EboWs2RSO80Ox18AwvzHzQNtEzW+UKPnaOmN/2yUqTMR/XxAVFIrSulRYwQ95q6DDO /l8L1MKNdA8zibvR/e68/9RKq64jff5X3hYLMbh7Aynf0qV1dviWDSvLmBlwkSFGaQSd YdWCXIEdKd9SpQAQukK8cz78sgGj05Le/8jqIs2jVqVE2CZeVpTIh5rXudzSOcZWdNT6 gLsP0kLGMgqDbNd0iQibWCVXJ8Pp745Uqr7oJe2cwyxCZ9Zp3IrMf0Zm/yacIiBf7TIm ntX+VmWosfkWKvPrFUn5EzkMftzc/rt+00y2f+b/PynHPBhin01RATL7POguIav4iiE+ X69w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f89WwZZS; spf=pass (google.com: domain of fm-1324425-202503071225514352673082a9d988a6-ndvqud@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-202503071225514352673082a9d988a6-NdVqUD@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1741350358; x=1741955158; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=CgaPUpEs+LjOvJ0n42kgMiR9qtdNHF4+2EkRtdQk2fM=; b=g03sYqy3kVPByNtpbNlPLx6vtw1GGwcwSW097CQFRUBulq186+v57s5oiUzUIymnNQ zttF/TPoHI2mxVXcBdRFLUOS2wu5y7LRWO1Oa6xLpsF+7HYujpt0SEqWiM6z0FCjPQHw oBrobWWc4DgbcBNqXOzu6TRErjeDDRntTzKYQcb9BnjEcIGDJmyTYKBPU1ucdq3vzNbX vX5D70oWubgXPi7KNW/8aEBeTxmi7Z3Ic92SRqYFQYjITDR1OfI7vmulOBNK4fCf4hNS yaS+7QLG3D/ZagdXUZ6OX6NOPOSNc+xMVNOmF+tW/MutuVtR2rFPmIWSaxFJbYCpebKg cXgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350358; x=1741955158; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CgaPUpEs+LjOvJ0n42kgMiR9qtdNHF4+2EkRtdQk2fM=; b=mGTjb8osrlgtWtRBOzpaxWNTRz7oVOkPGpY7CZ9QeEb0tk13lcm5qLBDz6hwMe0Qsq AILUHGqXUq7TlMyNkC5os+vXMSLKtCV7Ys+WtC8GEm0C3AZnbCxbXFYvqhAJNw9HotJR kmeIorC0nqbIOboExgDM7HJhvdG/dGOpqq5h0Eyb6H/Wp9irb0QIUK5aNHf2jsCuJeP5 I9UiJ6BX5+Z9sRp33lmqm37JQJ72Gs/KSt1oz4MBHoSZXgPKLnmRP8X/iIelcpuuPVic Pm6df7nxD5wKcF9eCj4IIkn1zaBNEzFUTIncH2WaIdiXQmDd8XP3D53Jn59sVtYOhAuA Z2GQ== X-Forwarded-Encrypted: i=2; AJvYcCVD4lHDMYmTOvlc6rSQneALLZ5YhM8jba5ZrPB0f7vfNeiJoeIt4Z63uBRy1B+bdP+RxFnBwSE=@isar-build.org X-Gm-Message-State: AOJu0YzO3j7VkMaq1tIM/AcBjtVIUo1FZ0p+0nqmf/uTqWNmF5ijHGcz kks90JK1avGYdc90lApwJCXbbD5bkRWBj030v9oSFQwh2TLi+whh X-Google-Smtp-Source: AGHT+IGvrlMpiOmgen5c8nCRdz2UL+VDo+l3Vn53NPyGuxjXkeUEDQ1WP4FXR2lNjHnEutVQDQzgsg== X-Received: by 2002:ad4:500c:0:b0:6e6:6c7c:984a with SMTP id 6a1803df08f44-6e9006776admr26713356d6.29.1741350357934; Fri, 07 Mar 2025 04:25:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVE7Ck1RFvvBCTAbwtBBE+Wf7/BgMdeZSIT4QrYo74r+bg== Received: by 2002:a05:6214:2e0c:b0:6e8:f4cb:3021 with SMTP id 6a1803df08f44-6e8f4ed2520ls16811596d6.2.-pod-prod-09-us; Fri, 07 Mar 2025 04:25:56 -0800 (PST) X-Received: by 2002:a05:6122:2a54:b0:519:fcf2:ef51 with SMTP id 71dfb90a1353d-523e4161e78mr1877316e0c.5.1741350356730; Fri, 07 Mar 2025 04:25:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741350356; cv=none; d=google.com; s=arc-20240605; b=CCcaxwnxOznLxnPICB+gKVPealz0Xs7bZ7FRWFe0DBJIx32U9TQ/3cWQGvDRZyzEgX 9yLUFp0B8a6BX8UwatjFFUlxMUaTp6XbUd6sGMq7makNXCAHpMvB2j34VTInYYkpibQe OR6buDLoTZaZxePMFV4U4bvNALrRWegahDLJZO+hu5gKdm77g/NsBLPR3d2Uggmg4NXj pemMVe17gtk+IWVKidx8B85UWuF2RUiLBmJt6tGhC5JtQZuxLsRj8WytMoOOnsSXRYps lmBE/r8lILR4UCOtOfBRSv1tuAzouZb+Yq5aRvl76SaTAiEIfOVfU3AVheH6N62tqJPl 2q7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=2t3HkksiQKAT98bwnH4mfLBRKyeDU01p1GVw+ACIcDs=; fh=+knGHaK73ds00pYLzNOS97UmwCobvOJfLZ+fkHD4JEI=; b=MxqDv0f2vxhmYJUR+Rx2Qf8V4KMbuYnYj85fIRtT7XiAtO3LCNyHcgIvkHIQqEqzY2 fpIcqjz28j7BZQA9+YePApdru7f3KO0PgSznEsG65c80Hs1BPiOWNdzCSW978SyW7q71 Q5lvPLJEH5jWJ+WwDPP1pWHScE1ac6khrYpHhDFKSM380NUY2C3129vEhw95zLmCt7q4 FeZ/7qh9DzzCkZo+ZNGHgULGU8y9yTJs7JEwweyRlp80ugPsqZdl7WJ2+Tk6IFQ//3vX oQDiYHw8FlY+4EpB0v3jfN4Nf1fo1BbXvgL+ey4iaFU/2xvBvjmVE75NAlulYS20/x7V l5TQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f89WwZZS; spf=pass (google.com: domain of fm-1324425-202503071225514352673082a9d988a6-ndvqud@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-202503071225514352673082a9d988a6-NdVqUD@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 71dfb90a1353d-523d8ab2ec3si139627e0c.2.2025.03.07.04.25.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Mar 2025 04:25:56 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-202503071225514352673082a9d988a6-ndvqud@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202503071225514352673082a9d988a6 for ; Fri, 07 Mar 2025 13:25:51 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, ubely@ilbers.de, Adithya.Balakumar@toshiba-tsip.com, srinuvasan Subject: [PATCH v2 1/3] mmdebstrap: add "skip=cleanup/reproducible" option to mmdebstrap Date: Fri, 7 Mar 2025 17:55:56 +0530 Message-Id: <20250307122558.1882902-1-srinuvasan.a@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f89WwZZS; spf=pass (google.com: domain of fm-1324425-202503071225514352673082a9d988a6-ndvqud@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-202503071225514352673082a9d988a6-NdVqUD@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: srinuvasan Without this option, mmdebstrap deletes the var/log/dpkg.log and its siblings by default, but this is needed to download deb-src packages for base-apt creation. Basically, we are referring to the package's status under /var/log/dpkg.log file and performing the debsrc_download operation. Without these changes, bootstrap related deb-src files are not downloaded under the /downloads/deb-src folder, due to this the repo sanity check functions failed during base-apt caching stage. Signed-off-by: srinuvasan --- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 931f6f13..7380a658 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -168,6 +168,11 @@ do_bootstrap() { arch_param="$arch_param,${COMPAT_DISTRO_ARCH}" fi + cleanup= + if [ "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'yes', 'no', d)}" = "yes" ]; then + cleanup="--skip=cleanup/reproducible" + fi + # Cleanup mounts if fails trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap '[ -r "${WORKDIR}/mmtmpdir" ] && tmpdir=$(cat "${WORKDIR}/mmtmpdir") \ @@ -183,6 +188,7 @@ do_bootstrap() { sudo TMPDIR="${BOOTSTRAP_TMPDIR}" mmdebstrap $bootstrap_args \ $arch_param \ + $cleanup \ --mode=unshare \ ${MMHOOKS} \ --setup-hook='mkdir -p "$1/var/cache/apt/archives/"' \ From patchwork Fri Mar 7 12:25:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4081 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 07 Mar 2025 13:26:07 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 527CQ5Sq027310 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 7 Mar 2025 13:26:06 +0100 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6e905e89798sf2912226d6.3 for ; Fri, 07 Mar 2025 04:26:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1741350360; cv=pass; d=google.com; s=arc-20240605; b=IM29aYXLCY2gn0MFDncymceAAEB4QrwX7b3LNRQeeuYOix+IQTfOdQaax23j9AAqiN m6KnIth9sYyNgKyXFCL7CQ18+dbZSwzVWZerRPYqrU5ezkXJJchHXGCu4AKXBGzCSZPF ppEE4lnlbbnYXWZHc5+D5QJ7t6arQefyVgrjp6eDlMYrG9SBRiKod3ZWlK124lAjFAL7 ibQdqMzmhQ50whAy3gEcZp+Xor18J+SN0ay74LwLs8iwnq84Bu2sw/yQeq929DqHHXow 8v/MJDNoZ6K+FTm4CkaBvHNDrL22/J7EPjDoDnl5n8I9fgL4UP7sf99xnlnuHBdBWNk/ 7J+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=82bCNShw3ri91wwptCqulCCcjcCV98mQyueQATxzK/s=; fh=z5mQ+IN26I1+2G22ZgtzJsMixuHeSa040l5XVZpoNhc=; b=BfNWhALuqfeJAfmkD2x0WoahKwexD+S7Zj924YnRZUnYZ+/cKI652AnL4KAzvwI5YY D0Wk0UG7ANahB/HZgLk5JhJzmGvgG66+SKxfG9dFEgogf8e0gyRtI4eTUDB5pgFYpmTV 6A1cLQQKGZo61uDl00CEfuJRFT70UjhGMo5GkJm1NMIpe86G7lShmhxyAT7AJ8CcVZHz wqet0Dr1+u8VrfEHo+052yp7NO3qVZuxCRtAf+VNaixqSuvSaNR8U23ZrP3M3pcfELn9 EIeTgfog00RlaiYhMLBOXJX1DerDLlMk45m7qY5u7Par4456Y2V6+mTEAtYIbYYvYXkB GX0g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QBVsUFB5; spf=pass (google.com: domain of fm-1324425-202503071225547f4c9078926c63892a-wtwlnb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-202503071225547f4c9078926c63892a-WTWlNb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1741350360; x=1741955160; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=82bCNShw3ri91wwptCqulCCcjcCV98mQyueQATxzK/s=; b=eMcFR4X8G42Y32KldKy+1rIiOYdu9LMoMy4bD1bfHZI2aycFE9NPZfgShEVI+mFFZ+ zg+CG9trj5ekcyh1PLP6ePYPScYyOCCRwlbm4T52W8lbGA7XU2gcMwViOXUT6p/O/nix vfKFdRD+2qldtHx2V37cS+LK/ZKdAZuvU8mK5S8RjX4CrMSx6ihi8jj78ofddZaFLEuE ueS5ys/J+y1g6Nz7NxC/IgIC+WJqVgRL77r2WP1r6Xa0aOiCJrPpGNj+Vcr794/hrQTs omMV3vBZYwTn5tzkvKVrtyaNTO9m/WlPL9EgMiu9IzuDSxDAXS6VQlyi6JxDl0XGXq/K zTUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350360; x=1741955160; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=82bCNShw3ri91wwptCqulCCcjcCV98mQyueQATxzK/s=; b=THyen+KoUzHlToiuu8Qzx8j5nuL4GEYF2q4fhJifBb8n06ppqDjsSTUz2n+FfKIQVF OkTIa8kq5+mdWR+L/iYuK8CZI2TPGfGp9PFco29PolpQtRkC7y8EuaG3GmXgPA955kBV KoDQQbJEA6ux7U2Dz2ojtiHhD6W8vUAeN6ONyq+EMJezDXc48pmpuUh/rxh3jmgKNTXm E8G5jG8oR3ru/h491NU6oaBtXWoJPRZTqoy+9Orvaiz1Q6wwIJFshDla5Au5ETkvF4rp NaT5QwG95hx1c7SM8THByvdfsoedEmCkKLTmE7eab3pIgbF9ctFc1YKmwdU+REE7blUQ ItxQ== X-Forwarded-Encrypted: i=2; AJvYcCXnCpx3mK24+BKPCbPkP4Dlqa96SBswIBWQx66/o5kTXcHp/cf647V5quJlKyBDsr7mfCscD9g=@isar-build.org X-Gm-Message-State: AOJu0YwvrROWVE3apFQ/WWtbwCeIQ8/W8GyoavRGT8BqUCY71NShYwUw 6Lbw+o/2owDJJB9a8IoHSm064cPlKcBwhM+KbKwgbCtZsPK4g8rw X-Google-Smtp-Source: AGHT+IFDIZzjkVjUbMbgPuqd8E/NY+rz1Bhxy2Upok24gnBSz4FSHbOHrxKeYimuFdPattrlMIzHeg== X-Received: by 2002:a05:6214:d49:b0:6e8:9866:7398 with SMTP id 6a1803df08f44-6e900605653mr37920726d6.22.1741350359903; Fri, 07 Mar 2025 04:25:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVGOjfCY9+fkpukbgKKev+tWmVc0XtsJ3Jd0YBK3q4FtGQ== Received: by 2002:a0c:ec50:0:b0:6e8:efc0:7a3f with SMTP id 6a1803df08f44-6e8f4ef3894ls10819436d6.2.-pod-prod-03-us; Fri, 07 Mar 2025 04:25:59 -0800 (PST) X-Received: by 2002:a05:6122:790:b0:520:4539:4b4c with SMTP id 71dfb90a1353d-523e42a5b5dmr2026143e0c.9.1741350359097; Fri, 07 Mar 2025 04:25:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741350359; cv=none; d=google.com; s=arc-20240605; b=KYgwXseWpwPL8bRon+/2xz/6bcpnXknju24VQlzdkrvp77O34ka0AiJ1SFKMGoeEEj /yyZKzTyS4724giyqWUk5vg8ZEFRPlYgsWRwEzeYjmvXFV0AbSIKARn0xhJz8UES31+v CKqpFs3k9JbieQ8ifmxvG4oEkZ4CUU/YDeLEWHxCbvzkkTIfZ43Cy6sGUVtbZhjxZriQ KbhQbTxVU1gEkSRlFdf3udXj96AoU0HNdvmRu0O7l71xeCa0FKmacIunpF2xwz34Qdi3 nQDJOYFD715GQ7WZ5eaSD1/rbgTwqmpWB3dGygw1LR1/RuPs570QuxJjGGmXIeSR0NKv FsVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=6mJAo6oMTMsFwTlkLJvf4PHOVbL32AefFQju0RBLNqM=; fh=+knGHaK73ds00pYLzNOS97UmwCobvOJfLZ+fkHD4JEI=; b=ZwHLJYiNReKgXc1kqLHY6DA6QFZsX7CDpA0Cs0dOHlm7gX0Nb3XYrbgJb+d4nEFLsm zsC2B5LuJSiNfGsTVRoxkkvWXOu727oNa6eJy/Z7ox4pVfmOxE1doqs0SsJKjhvx+H2H hPHSgaWT4c7UEyJ4CdlJd23BrPTg7Ngq3rTonJ7k7GGAI69FUurZLklkWdsQ213gMiq0 VRYT5jSEcebqkO09+yhGnFm6DtzbTyO6bHqbamsPtj6Y7hpQ/esW8AsL8NkrBiY+SRcq vEJieOga1AQ6JsE95slEHaAitg5i8LgoOk2PStRloOyto5bjvm30NkM6o9ZlPr8JkLH+ U1QQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QBVsUFB5; spf=pass (google.com: domain of fm-1324425-202503071225547f4c9078926c63892a-wtwlnb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-202503071225547f4c9078926c63892a-WTWlNb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 71dfb90a1353d-523d8a6c947si163950e0c.1.2025.03.07.04.25.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Mar 2025 04:25:59 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-202503071225547f4c9078926c63892a-wtwlnb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202503071225547f4c9078926c63892a for ; Fri, 07 Mar 2025 13:25:54 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, ubely@ilbers.de, Adithya.Balakumar@toshiba-tsip.com, srinuvasan Subject: [PATCH v2 2/3] image: download deb-src packages after imager creation Date: Fri, 7 Mar 2025 17:55:57 +0530 Message-Id: <20250307122558.1882902-2-srinuvasan.a@siemens.com> In-Reply-To: <20250307122558.1882902-1-srinuvasan.a@siemens.com> References: <20250307122558.1882902-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QBVsUFB5; spf=pass (google.com: domain of fm-1324425-202503071225547f4c9078926c63892a-wtwlnb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-202503071225547f4c9078926c63892a-WTWlNb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: srinuvasan With the present implementation, deb-src packages are missing for imager related deb packages (packages listed in IMAGER_INSTALL). Copy the /var/log/dpkg.log file from the sbuild environment to outside With that, use the list to download deb-src packages for IMAGER_INSTALL related deb packages. Presently, cache_deb_src function running as part of ROOTFS_POSTPROCESS_COMMAND, this will not be helpful to get the imager related deb-src packages, hence make cache_deb_src as a separate task and running always after do_image to get the imager deps related deb-src packages. Signed-off-by: srinuvasan --- meta/classes/image-tools-extension.bbclass | 19 +++++++++++++++++-- meta/classes/image.bbclass | 8 +++++++- meta/classes/rootfs.bbclass | 3 ++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index e8ace8f5..0615229a 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -7,6 +7,9 @@ inherit sbuild +PP = "/home/builder/${PN}-${MACHINE}" +ext_root="${PP}/rootfs" + IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" @@ -58,10 +61,17 @@ imager_run() { EOAPT deb_dl_dir_export ${schroot_dir} ${distro} - schroot -r -c ${session_id} -d / -u root -- sh -c " \ + export local_install=${local_install} + schroot -r -c ${session_id} -d / -u root -- /bin/bash <<"EOAPT" + rm -f /var/log/dpkg.log + pkg_status="$(dpkg-query --showformat='${binary:Package}\t' --show ${local_install} || echo "Not installed")" apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ - ${local_install}" + ${local_install} + if echo "${pkg_status}" | grep "Not installed"; then + cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log + fi +EOAPT fi schroot -r -c ${session_id} "$@" @@ -69,5 +79,10 @@ EOAPT schroot -e -c ${session_id} remove_mounts + schroot_delete_configs + + if [ -e ${WORKDIR}/rootfs/dpkg_partial.log ]; then + sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" + fi } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 56eca202..66b4d313 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -72,7 +72,13 @@ ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" -ROOTFS_POSTPROCESS_COMMAND:prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " +CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}" + +python () { + if bb.utils.to_boolean(d.getVar('CACHE_DEB_SRC')): + bb.build.addtask('do_cache_deb_src', 'do_deploy', 'do_image', d) +} + inherit rootfs inherit sdk diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 2348e269..c9e832dc 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -272,7 +272,8 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -cache_deb_src() { +do_cache_deb_src[network] = "${TASK_USE_SUDO}" +do_cache_deb_src() { if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] || [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar From patchwork Fri Mar 7 12:25:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4082 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 07 Mar 2025 13:26:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f184.google.com (mail-pl1-f184.google.com [209.85.214.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 527CQ8BK027323 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 7 Mar 2025 13:26:09 +0100 Received: by mail-pl1-f184.google.com with SMTP id d9443c01a7336-2240c997059sf41776435ad.0 for ; Fri, 07 Mar 2025 04:26:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1741350362; cv=pass; d=google.com; s=arc-20240605; b=flQcua2yJCpD3wiXPHJvzzuzfjNDPDqCie3DN/hEqHRRr3YT/Ih6A/Vsd4Hdks34+r z3gAh99DdQru/cEfrFc0EKH6DIC/0h3N00aaBFHmXAW7rbT50UaNbHWVXocwRV1it6DP wGAZjBrM6OTefcWd5VrHrU7Y4ZDo54QS0BVSm1E07EogpuZ/zBLzatlXGG86OK2GAGcf Ib8mgD8MRbjmK6ZlxLj0NHSkXRkTx3CGQTLEXUqRczPOCZ/5PE7fr2NhFMF0tRBRa7rB J0lOCvJFG8iLQx5XcL65z5GHkIR9fxUUqe6ZtN3LfP19qeOi6cmtvjiKTzWgX71MD0J+ HdVA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bYRbOvapNpKyk3tclQCE0GA0Hpr18bJqVtD8CjFhK4c=; fh=l2C3eZ/Lsp/aCQ6PdjAI1LWJLSZ2snU+6zRl6lWVfo4=; b=J65KMLTeg3rokr0rPezf2lDwvccuAaN8PY1HHeIJGAV/v6m6MguNkR5j/25fFXdphA diy+tOClTtMTDKr82Rz9x/NGBqj7tPNFrI1eqPAsTmhX0vxlhRvLOgxQPBgwCGu5xOm4 Z9qjhOoL5K28SfR6U60S7x4FTXZxhAcO5e12Z2XpwekFgTymT8BTZt8IH+E+wBMZ8YyE rziViYtBknYQAWPTkSY3QLFJ/bQ9I8LwG3Yk6DvQJ8LL7lZzzWl8VW7AogqhPEvCW8h9 CzT/FF9uQOHsEXAwTSpMk/6p/CFE9jNecPEgK5ZKEMf+yxwN2K8R9xZudtSwEZB9SG7v 3Zqw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=esfvcXD3; spf=pass (google.com: domain of fm-1324425-2025030712255642bf0b898fd1192289-bv0t_u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-2025030712255642bf0b898fd1192289-BV0T_U@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1741350362; x=1741955162; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=bYRbOvapNpKyk3tclQCE0GA0Hpr18bJqVtD8CjFhK4c=; b=OKxm2H33doBFSYck/2zhgV/37XAJwLC4vx14tCvjGG+vJyd9wCdRv9CA0+97dTfTyR IrmlhvUOoKCQKaRgii+Nx0vJqA/dSTN/DFCrpqCY2c5tbwonlOeftFr0i/AVO/JnM5QY yWuflzWbvH2SznWja1Xr8m31t12u9vyEHmt2QqCnAn/8FK6BFjlc7zg7yYrxB18LbXCk 4aInfb7QbtU2VCPtH6PnZctL2UBwIsqjm5HTrrdITg3DueuKnb9vwbRyDSXGue2c6R16 mKjAVaNhfU0dCP0MeRe1cqgT3CqCW8YMzbH+t0IRYNnVI5EIho5+3uc92nC7HvOZ96ca fpsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350362; x=1741955162; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bYRbOvapNpKyk3tclQCE0GA0Hpr18bJqVtD8CjFhK4c=; b=WruGhGkPXevblYNQ1+toN0cudQC8MW0N7SywEAw/J790s0XcySo0S8lGZpHX+M8gxI /R68YY4rAt6LPGzWftiapdcHEOh+v2Drmqdf/Tlv5TUe957ztvIbKoVNU6/SntNEZklS Q6Hm8k26mRtHztgsOZNfl4dkNVawmK0rQMKFv9JB6CAgDEReo2/fwYF5sLf8hi6suaLf h13iODhda0ogsav4Qgb/tVb+gwKZSjEeCSNzXnepAHUoXkvXFRIwF5Ty6PkuewcoGz0w 3iIIpSVu3v1f3+3P3/GD4b3RvmPoWt/7sXOIJ4+YRtlA9bW0rMt8F+BGx+ODnExfr6ae tjhg== X-Forwarded-Encrypted: i=2; AJvYcCXan5L5wVb8ZcCsyEVzgLSJskLuL2ZyVIbUqJF4zOyyqbw93GF6XNC46TWxBbZE6N6V2Q0iMsM=@isar-build.org X-Gm-Message-State: AOJu0Yw230ptLZAmMn9s/g0fNoxzVDWWHKW8k4kmVALSDhYrSKU/6tR5 JTzJmV1i7X9s8ZPfMqVZ/xfI4RjAv1Z00VtSYVN4E41/MfLGUEui X-Google-Smtp-Source: AGHT+IFKlAtxfUTyzokMWE5iIPrVEBbIbtY93W5ATRtR9rW9N6mcpC1pliomrUy9541JPV84wRUUJw== X-Received: by 2002:a05:6a00:1817:b0:736:3c2b:c38e with SMTP id d2e1a72fcca58-736aa9f1fefmr4461895b3a.13.1741350362259; Fri, 07 Mar 2025 04:26:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVFRAPikoH/iSJRTWNPdOvg3k3kt4xUF10W+lSg9V6VNJQ== Received: by 2002:a05:6a00:1b4c:b0:730:8472:3054 with SMTP id d2e1a72fcca58-73694aa2f81ls2357400b3a.1.-pod-prod-03-us; Fri, 07 Mar 2025 04:26:01 -0800 (PST) X-Received: by 2002:a05:6a21:4014:b0:1f3:46a1:efd7 with SMTP id adf61e73a8af0-1f544f67b49mr4936926637.42.1741350360911; Fri, 07 Mar 2025 04:26:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741350360; cv=none; d=google.com; s=arc-20240605; b=R9MzPbs10dArEYkhkJEUGGSa/f1JHrrpf98C3q5e97PyO70JpDThjmoi3dJNwV9LRP c2NH5GRp7U6O3dU6dPT6crXqz9mpYHNCYJkAPH8yPnUHGgLnzkvWx7MXHdqI162liVAU LPIIWxYpqSzFMHmHOSPgDE6E+nPuSj4FABANt7RlQLTEFyUCHLF5atNLZEip3UL7fD5J qxTRuavxkf0UPMJCwOMsTBW9ngGD8YkFVTKp/Ee1IOOit78quwQIJ3lVbfrSlZnLQ1nG OmvssFRGWP7y3/88Q6Ffjwd2Yd9v7f0GWHSYh3RcJxhsM6Ee0TbBgKcvjEJv2qbd/Z42 4Zng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=C4pvgOkxF1DvDFj5bvvDlRinYpGfkM/S+xHgpWBmciw=; fh=+knGHaK73ds00pYLzNOS97UmwCobvOJfLZ+fkHD4JEI=; b=XwWqbAc+ZN3lP9VcJ92cGOq8MVNhYnfj275v9xT7DEnF/ROs1/lrXtEXD10T05G5Tn BTmrhC5nW/XkjzPCG2dfKNov3XANgosdLAiwX7LlVnuooCD+SyuIJygNliDDc648JNOY 7ay+AhP1x9lHKJ1dvTASabU6oro33rGECb7N+RZW5AbCAXAbz+cL6TadIuD9uF7ffDK0 CYf0H/I+TItVV2yI21TsgDC9/NCD4AGQZcmCmHiR3yN/0iHLjO/AZahQgAo/ws5f10E7 9C0OJwmsqZUINPfkag467pwS+qxyXfNkgWwFyyz9ud1vQpVSyP1jwUbWcyNkH5yztNo1 LZCQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=esfvcXD3; spf=pass (google.com: domain of fm-1324425-2025030712255642bf0b898fd1192289-bv0t_u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-2025030712255642bf0b898fd1192289-BV0T_U@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-af281089d8esi145143a12.2.2025.03.07.04.26.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Mar 2025 04:26:00 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-2025030712255642bf0b898fd1192289-bv0t_u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2025030712255642bf0b898fd1192289 for ; Fri, 07 Mar 2025 13:25:56 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, ubely@ilbers.de, Adithya.Balakumar@toshiba-tsip.com, srinuvasan Subject: [PATCH v2 3/3] image: disable clean-log-files ROOTFS_FEATURES for deb-src caching Date: Fri, 7 Mar 2025 17:55:58 +0530 Message-Id: <20250307122558.1882902-3-srinuvasan.a@siemens.com> In-Reply-To: <20250307122558.1882902-1-srinuvasan.a@siemens.com> References: <20250307122558.1882902-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=esfvcXD3; spf=pass (google.com: domain of fm-1324425-2025030712255642bf0b898fd1192289-bv0t_u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1324425-2025030712255642bf0b898fd1192289-BV0T_U@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: srinuvasan By default the /var/log/dpkg.log file is removed as part of rootfs postprocessing in the regular image builds, but this is needed to get the IMAGE_ROOTFS related deb-src packages during debian source caching, hence make this feature like a configurable one rather than enabled by default. Signed-off-by: srinuvasan --- meta/classes/image.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 66b4d313..94ecef86 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -66,7 +66,8 @@ inherit multiarch inherit essential ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-log-files clean-debconf-cache" +ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-debconf-cache" +ROOTFS_FEATURES += "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '', 'clean-log-files', d)}" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"