From patchwork Wed Jan 22 13:49:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benedikt Niedermayr X-Patchwork-Id: 4023 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 22 Jan 2025 14:49:25 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50MDnOcj001460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Jan 2025 14:49:24 +0100 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-53e39a081f9sf3763323e87.0 for ; Wed, 22 Jan 2025 05:49:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737553759; cv=pass; d=google.com; s=arc-20240605; b=EIeDImeBKBi2XrOsw2/DvrQSWZrkUuM8Xf2j4P618Dz62QMfCGE+QKnmitUfQf9fiz 4BLdWRB+owp0zmgbUNanzA/rKmSrxrKuMa1Y9fcG/MU+iNCwYn1qvj9fZ3swlm1fVraI 42qIZrVsvtNYKq0eXwAPnjhZ5nNRoyhU2h1ZHUk/JFWySIE9iPosDCR5ApHOOyinWpOn 328nVTDXjhZzT+3hn7d9ifxsv6VP3hN7wDnin8yFJWDhKpcBH7VYi+tuQpZuHbV4fG/c Xlc55neiMgYMDCloKWCilrrnw8/YuIvK8OdC7juUFnyZtpwB00jDW3MG0fM9qWTy1YrB Jxpg== 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=nvmj7R8xhdhg+Rm9NrzA1tH33NKiagxbWoOBDFslJ4s=; fh=vzzcwIzULZIdLWMJzdVmIyyQADnKXfnpWykRR1nATHY=; b=RdvCCUZjIW/aHujL5YKF4Iyf/VfH1gdfJx/9X7GGQN8VFZ6mjr76KDXjadFZJe/Gw2 C9+d2qJHnn35OiP816ntLIAZkVD93yei5QhXBFNLGuVyADOQedFX0v0cbCbthTZMIu5E WteFmQFrgCwPvTUT1oOWxwjkATdVwZ4ovBSHv86POH7jh4zIetzKyfK8tJvG6f5gO252 /d+LGPjZ/45OcQ83t8C6lOQwCO5aZ2M5VmXtdsqmGcNXQmS3H3RuXM98dlTnPQHgcqzd 9kb+8RpAj+fKgkAD7iGvb1/G2hrXr2bFv/w/lXee4+n40P320jRajsZyQxelBZEB6Koc 3Iag==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=DkbKfMci; spf=pass (google.com: domain of fm-1323861-202501221349143477f74461adcb1f57-gkq7vl@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1323861-202501221349143477f74461adcb1f57-GKQ7vl@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=1737553759; x=1738158559; 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=nvmj7R8xhdhg+Rm9NrzA1tH33NKiagxbWoOBDFslJ4s=; b=NnWi4N9xoOSPWlItyjDdpPApaA1tmk9ZrzQUEy1D1H2y6Um85aWoMSrmwhCxq9tZO/ cx7IT7sAGylwGaEYIDAoHp17k7kSJwMKnPEYt+3TNwL0ZFyLhySQOSb2fPRHRisrfPEi Yd5lqbnTn7acVBfpghRsf0QdHxIa2P09MWmdLJizHcklfuCjL1dwkk0lzO7nfiOwln53 psWibxVAbEWVX5KZwoPFe44i/KGkKOVdJR9wzUAQVoCOaeLvjkjRbQXUYod/xh+fncnV RONs1qhHYmxa5ZAdiPGck7cPbDYkUuWqDc580FLYjYEv+y53YYgqUFMWZyRJIcXz2IEr eL0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737553759; x=1738158559; 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=nvmj7R8xhdhg+Rm9NrzA1tH33NKiagxbWoOBDFslJ4s=; b=Due4JythNCBFjE49bqf9kwSy9SBEVqEeqASf/TaOxdVpChT5ZIOtaIyJxpqwDYxMGK znGWXI2JSSot/d63jL/Edqi/0MZRsPMMni3ysbm7LvVINWGtE6jmni4zbY/+V7C8kRr/ k8voXXZtLGDiH9S4DuACMh+FW8+BmEPC44eL1mOegdvyZrA1qBfvYBMPdypZjRBqATrH QsCRViZHc7igqB7V0brdWZvLtPC6ZoDE/sUhM4OvmZe6X1ghYxqCoW3YxnvSBQEhOz6r b32bLyiR5tDgYNtvhnG5mOMzDjS9fyJtA5h6yesLsG4JaXeYv590vJ3f0wPnpMllUs77 9FTQ== X-Forwarded-Encrypted: i=2; AJvYcCX9NBlVoKVkkRmmLwGv2DPTmXDYN6XOjedRpQBmF7EaKXIoHTbPSXjeY45JG1pGJkGTCf+0+JQ=@isar-build.org X-Gm-Message-State: AOJu0Yyo8dx67B4SzuCJaM2RrRystIyTWwoN3oNBQVnUB/iJSHmKBCJP HSq4HfUzt7OA1VGw9KbV7+sIsFGq9dnMVqJrAaf2SUfVm/a8be1P X-Google-Smtp-Source: AGHT+IGXZI1qrup93o67CAhuO+FJZBsx82hW/WkPRovcXnFQ1CWJcVXGYw1jHZX3K98FW+TwFIh/+A== X-Received: by 2002:a05:6512:3189:b0:540:216e:b279 with SMTP id 2adb3069b0e04-5439c249e89mr8466503e87.31.1737553758134; Wed, 22 Jan 2025 05:49:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d0:b0:542:6f68:2b7f with SMTP id 2adb3069b0e04-542b06e7c10ls79794e87.0.-pod-prod-04-eu; Wed, 22 Jan 2025 05:49:16 -0800 (PST) X-Received: by 2002:a05:6512:33cf:b0:540:3572:1864 with SMTP id 2adb3069b0e04-5439c286c06mr8202368e87.44.1737553755685; Wed, 22 Jan 2025 05:49:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737553755; cv=none; d=google.com; s=arc-20240605; b=Atmdq/0fXXMRE3iwxYpDEyxPQvTVHGEfwjvgUOgi2BCtFSewOZEj/PnNjN2PTGmoDf SzdeADyWgjzfklSHgxCF8dMGL+O6O6gFhyuJ0W4J2BmBk8sDgSfM2ku5U/iBMwoKp1uL SA7xWoQ8X9FGLPPSBs9w5UZkS28NvqDm21l5gvF0TSQJAPKLWaUl5OfY39GI11yZWgQO xL9KFdlOnYScd2vvHK+x6W6Dw4UTymFqKp4XUqKC/Qj4trqUmVweFXCdxbTLnpy8mnFP Ycmy+YLboT51A09fGw9OBwtVPE4c1K/LP+oKpd9P3sq1DXRrT9t5VQG6P/XZO+pn7mxo Bo6g== 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=fu6usVT0f8oAHQxoCpMimKiJRn6wNhvtXy9dpGm3foQ=; fh=dLKbFY1nCVs0gw4Ot3U35lUCgkKClbVzBSGiWA5AeLc=; b=Xh8V38Xx+4gSnaKRUE7MwvBFM7zuHL9lHeO30kxMtgdYwVToBmUVUGMq8cWHtmGhHB 7kjxzcdbGVRLwtK1bAP9ANH6W+nwbnw9nWkZS0FzOIg2rMO/0JkrMPRfJ8xJ09x7uu4E y0vtwsPDv0kY5Ol0VZ9JrL71XhuPIcTlcfAEga7QNt1JyDNU94cOjBzkIJurHpJhJlBY 0tArqfMFh/E3KycgyWNFCulUgwEv9UJr4l1OqpqhbSzfeLdDOHY7yPyINUUCVLRPZYVs F37AQqGFoYm3arHuj2V/c4K1OJsVWUMufFzL2EAZb9opxjGyAMlqFXc90JQoZ/nqUhGc IUkg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=DkbKfMci; spf=pass (google.com: domain of fm-1323861-202501221349143477f74461adcb1f57-gkq7vl@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1323861-202501221349143477f74461adcb1f57-GKQ7vl@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 2adb3069b0e04-5439af04c52si321585e87.2.2025.01.22.05.49.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jan 2025 05:49:15 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1323861-202501221349143477f74461adcb1f57-gkq7vl@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 202501221349143477f74461adcb1f57 for ; Wed, 22 Jan 2025 14:49:14 +0100 X-Patchwork-Original-From: "'Benedikt Niedermayr' via isar-users" From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com Subject: [PATCH 1/1] deb-dl-dir: fix package source download Date: Wed, 22 Jan 2025 14:49:07 +0100 Message-Id: <20250122134907.2826754-2-benedikt.niedermayr@siemens.com> In-Reply-To: <20250122134907.2826754-1-benedikt.niedermayr@siemens.com> References: <20250122134907.2826754-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=DkbKfMci; spf=pass (google.com: domain of fm-1323861-202501221349143477f74461adcb1f57-gkq7vl@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1323861-202501221349143477f74461adcb1f57-GKQ7vl@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 debootstrap 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. 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}"