From patchwork Fri Jan 24 09:12:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benedikt Niedermayr X-Patchwork-Id: 4035 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 Jan 2025 10:12:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50O9CaeE012424 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 24 Jan 2025 10:12:36 +0100 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-43623bf2a83sf14879635e9.0 for ; Fri, 24 Jan 2025 01:12:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737709950; cv=pass; d=google.com; s=arc-20240605; b=RyxKhxyDwgeNKh3wS7cMGBRFPEbFP2t49RlnRVT8kxwzzIAWmS5iaeD/IR7IG2P8zM a+QIl7K/3SdIrOllw/c0EFobCgML+AZNUOnIyoLyFWD7MV8vXmCgII/x2mMHnXmLbc0R waWeg20aUvcDjykvKf+fLmAMFZAQxhkn6I0We74CnJRcao0N1G5WPmbdZ3JDAD71UBRl yOKGHQPNx/AJle06CS2je7IqXgxFe5UBEfGFhjMyMY/wEcm7BsxyO6xfXI5G8Iz7+GBZ iv44xMl4MRb4roRjOiHuEsy7si8CIIPu0VKIyB4SRuEaXRkc6geirz49g7g0bN/cCwJa o9xQ== 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:to:from :dkim-signature; bh=ivFnlKIucKmLny+mW5IdNfo4ZFqU/8syF9EIO/a63YU=; fh=cOpM/ge+bQqdql8HmEX821k/0GrfBD/Ze4EKesnJT8E=; b=IUmS9gd2WznUcya68q/cT6ifUq+Ip/lPs+Lka75WBnifPsmsK7thTiuhg9srZgZuB/ T66bDCmS8LOuSWUuT+a23usOta782bx9bj1ezjV+geelTQHioyKiOiEriHlXJNbdO/QF mg7se+42Hox+H59vZ80PkLfXFmmKqSe0l358pLITITDpR4ubc9Edrg7tbfAJ6s8V5i8k zAOimtg0IZ7eWjt77Qoc7PAU3lqwgvt5vsDLwLLTWNc0kiYa+Bgli89xy2Gg8ABlVoQ2 he1BB7io7JUYOMNlAkPQQk/wl8dr+k+ZlODkAx4t3sO+XmzICc/q/DDNDY/oCVmweK6X iWyw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=MbftoGWW; spf=pass (google.com: domain of fm-1323861-202501240912264af1cae69fb416a73c-ld5omi@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1323861-202501240912264af1cae69fb416a73c-ld5Omi@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=1737709950; x=1738314750; 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:to:from :from:to:cc:subject:date:message-id:reply-to; bh=ivFnlKIucKmLny+mW5IdNfo4ZFqU/8syF9EIO/a63YU=; b=s3ONCKtYYn7GmCV6TOO1OmokQFet5ELciwzgAC2EmiM/2w3MAajMBFsAzet78cy2qg ddAHd24ifMl9Q9USWVWPasrazeOerZkfuSiej1eUJIzzHLZT8yZaYLY+hzxsB+GPSMq5 xmfgOZt+fJt7ObxdzJoXGmcgMzxJjSgnx0utqJAPmS/7vwjRwSpUlJsu/m+vB5vDb4Zu sr3sWQN5B2l3yiNUEgkXpS8NF0x3/8JD3deNgktlpnsLtUnr/tCOomZcMtXuutUrOzWy T4BY4L0FGaGjw79DXfZRU3y61A0bBQ5efIAueeIrC3oCuYYMZdCE9yQWoiAixSXxE5Wh 6UdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737709950; x=1738314750; 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:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ivFnlKIucKmLny+mW5IdNfo4ZFqU/8syF9EIO/a63YU=; b=UXudGOVFYil5PQqnaD1mw0651R+PJGzLayyimsiD7cItAQm0PVU1pPabLsnAxfnypV 6vW6rJwvM0kIYUEmafoJ7Cutsq0PE00yJvYeArTV/72vZ67Q7xZVBPVS7IAuJF5O4wht QD1bXW+lH0HeigKcpd0FgUyfr9FRfyB/5rSNxCuMYQm5m2qeaSW2Lpr2SXP9DtWejr/s LMR6gIvQ1KUbpnizLNyipqN9jCSGQkDK9qy9BDsWKODfpCHhw12PtwaMFtOnjhiIjRxq 6AsV0+HUc7+2qXOIOws0JXqYv6yJuFQTLziAk1UzJ/agyo88Y2HRNt6EQywUToagUsxD 5lhw== X-Forwarded-Encrypted: i=2; AJvYcCXS6H522hIVqj/9Eu+AVDUWRWro63aiziJ4fVeCf9/rQ9WEZYDHVSiA3op2GlvUj6uVuMmQI/k=@isar-build.org X-Gm-Message-State: AOJu0YzBSiubut7H6eRARVOx6WJT6lH+q0gFQDxaATJ8/soOW/iU0Hrb Af6LJQGSQ6PjLpvkXPoYc18Ky7m/jNJ2z9Vk6m0RI7sKZNPKiB2a X-Google-Smtp-Source: AGHT+IHqGdd79I6T9QDme0UTa2ulIxfWupuGDPiGQElcjJSiMkTkpi9mLgvBsQQzVhASx8Qj5D5asA== X-Received: by 2002:a05:600c:6a94:b0:434:f753:600f with SMTP id 5b1f17b1804b1-438914376b1mr250863785e9.19.1737709949437; Fri, 24 Jan 2025 01:12:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c453:0:b0:436:1a7c:eebf with SMTP id 5b1f17b1804b1-438b87ba426ls4415305e9.2.-pod-prod-02-eu; Fri, 24 Jan 2025 01:12:27 -0800 (PST) X-Received: by 2002:a05:600c:1c84:b0:434:a94f:f8a9 with SMTP id 5b1f17b1804b1-4389144fa26mr249549425e9.28.1737709947103; Fri, 24 Jan 2025 01:12:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737709947; cv=none; d=google.com; s=arc-20240605; b=SoqX1wHuC2HOmRf2ClXPgbb3jgt/Qnl0KKT1o+SJf+XGjTElzoj09ySRZB2IxLG12M RkW+8YiTQY7MKAP6PteOLWXq7IDxuWOvT3KS8g6FlhlgeHNc8dGm6jHn3FReE7nDSrj3 dCvH67UEI5OrRJQn436hVgx+iMznuEyvU70e7DIIOBEBJzPbjWP+VjjbsVhiA6GTHPm0 rCCRk38OgAflqN1VPp29m0OLyRE70Cg8zWMnhaRZ6YZ+ZT0hj2xyV/7Mvfcr2Gl044FC 9lZZ2qE+5YllCE3NmBtRbkN2Lds8sbybjZ2glm/UCx6AgamxK1aosp1fouoK1mtMkq7h eFZg== 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:to:from:dkim-signature; bh=lNaL1K6m7ZhmuVvq9LYlMhLvWBB6x1ocjz9xM6g0htg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=hEv1d2D/pSdZEqz1zsGfmZDx4nJwA6s3BQM+dVA7B5zG6Jd9ayZ3woWw+ecrg5oeiy 8feI/mXGBpufhtfuzh298czS2TpyNmWHeBijuZHOXa+rUqPSiDVQDD9jwP1Y4AppiPu3 5e8GspX/HVG8V+xLHmO3bB5pfplD7CSaadueurffSeRuoVhxAU1BjsqLWwcx6sKBmoJ2 FVEJD1HRAVlZXYec473C273YzNEQYBmjKhVCJPfuwjMKvllmxRA7CSb0NjWVvHbD7kcm ilkxju08U/KL911K1qFMIlxtBYQ3+69IlhDH1+l2LtTH29GqQhVgiefpmk2+Esxed9ua lJoA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=MbftoGWW; spf=pass (google.com: domain of fm-1323861-202501240912264af1cae69fb416a73c-ld5omi@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1323861-202501240912264af1cae69fb416a73c-ld5Omi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-438bd4b988dsi322255e9.1.2025.01.24.01.12.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2025 01:12:27 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1323861-202501240912264af1cae69fb416a73c-ld5omi@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202501240912264af1cae69fb416a73c for ; Fri, 24 Jan 2025 10:12:26 +0100 X-Patchwork-Original-From: "'Benedikt Niedermayr' via isar-users" From: Benedikt Niedermayr To: isar-users@googlegroups.com Subject: [PATCH v2 1/1] deb-dl-dir: fix package source download Date: Fri, 24 Jan 2025 10:12:19 +0100 Message-Id: <20250124091219.3489707-2-benedikt.niedermayr@siemens.com> In-Reply-To: <20250124091219.3489707-1-benedikt.niedermayr@siemens.com> References: <20250124091219.3489707-1-benedikt.niedermayr@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1323861:519-21489:flowmailer X-Original-Sender: benedikt.niedermayr@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=MbftoGWW; spf=pass (google.com: domain of fm-1323861-202501240912264af1cae69fb416a73c-ld5omi@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1323861-202501240912264af1cae69fb416a73c-ld5Omi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Benedikt Niedermayr Reply-To: Benedikt Niedermayr 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?= Some of the packages that are part of the bootstrapped base filesystem were not downloaded when activating "cache-deb-src" via BASE_REPO_FEATURES. It seems that some (or all) packages are not listed in "/var/log/dpkg.log" leading to skip the download of these files. This is a regression that has been introduced with mmdebstrap, which either not creates or just deletes the mentioned log file. Package built by using the dpkg-prebuilt.bbclass tend to reference binary packages without providing any source package reference. To handle these, currently valid, cases the download function simply skips packages that could not be downloaded and prints a warning. Signed-off-by: Benedikt Niedermayr --- meta/classes/deb-dl-dir.bbclass | 39 ++++++++++----------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 7ebd057e5504..9f6d205894dc 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,23 +5,6 @@ inherit repository -is_not_part_of_current_build() { - local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )" - local arch="$( dpkg-deb --show --showformat '${Architecture}' "${1}" )" - local version="$( dpkg-deb --show --showformat '${Version}' "${1}" )" - # Since we are parsing all the debs in DEBDIR, we can to some extend - # try to eliminate some debs that are not part of the current multiconfig - # build using the below method. - local output="$( grep -xhs ".* status installed ${package}:${arch} ${version}" \ - "${IMAGE_ROOTFS}"/var/log/dpkg.log \ - "${SCHROOT_HOST_DIR}"/var/log/dpkg.log \ - "${SCHROOT_TARGET_DIR}"/var/log/dpkg.log \ - "${SCHROOT_HOST_DIR}"/tmp/dpkg_common.log \ - "${SCHROOT_TARGET_DIR}"/tmp/dpkg_common.log | head -1 )" - - [ -z "${output}" ] -} - debsrc_do_mounts() { sudo -s <"${DEBSRCDIR}/${rootfs_distro}.lock" debsrc_undo_mounts "${rootfs}"