From patchwork Sun Nov 17 15:45:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 3946 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sun, 17 Nov 2024 16:38:13 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pf1-f191.google.com (mail-pf1-f191.google.com [209.85.210.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AHFbuxr021146 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Nov 2024 16:37:57 +0100 Received: by mail-pf1-f191.google.com with SMTP id d2e1a72fcca58-71e479829c8sf3282945b3a.0 for ; Sun, 17 Nov 2024 07:37:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1731857870; cv=pass; d=google.com; s=arc-20240605; b=AoyqA6s/v84ph1AUp0KQHKAiplVGHiTLz+GK/+kcQo++4mY2/IV4WQiV+h95iHk32g h2Lokupy5egO8TvhJmEl4OodXCgY7Kc+p3L6L8akir2uyQrRgUqjLZf3vgxbhes+ykj+ bN33FuvbfwjPVx9koy4gxatOec1w+esnO+yvf4L+PCfGOkd5OiItnqXnfc1pNUCbMGoA LdjHsCHWNxP8BaI7Zt6hlFYqlA00zaBxogrCPZY0cEGCP8kT67a8YAHwwSnV7XDEbpvS 5kOo0JPoHxwf9v4OyE214VPyHaep0QHWeTYbVRV64xTfxT7G5ibXin5WJ+jiwqilbJnW kJcw== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=c+sRoSUE7Oqly7m98fCB8UDFg9E0A9dIYIO7celjHZw=; fh=6hfvjWhMSjq6te1087vHJmGk/CU2T76Rb/H/hmwUKS4=; b=kzTCAAnUx0TsSuRi62t78RjO+n4KUGP5DWa9KPk8ExO9lsia5pNdpCJVLsuuxBhmbJ 6cO+0ujyYof5wKltsUSiASCMoWA5ziOjXnlBUhwmgN9N5l1Srk/9bKyS1LqBVwL9rwqs wbj3TIN9ZxvQfWfvC9RdzZOcCYybRIafTyJNIQw4iaRSe8fqyFaG/9m64/bjooARaO/B 7EJ/eSTPps2bEI/oLLYXJadkk80URni7Z8eHM3RijSZzF3ETdJ3eQD/ffeVEcY3I/w9+ MPh67qNolRSgo/wV7mNag7hxybBJzz0ddILZnTKCh9UIp4FeHhM6zmbfxJ2B1CKfY5hp d4Qw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KzAYZn7j; spf=pass (google.com: domain of fm-1324425-20241117153746014a4e3a669eef14b0-xt7vkp@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241117153746014a4e3a669eef14b0-XT7vKp@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=1731857870; x=1732462670; 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c+sRoSUE7Oqly7m98fCB8UDFg9E0A9dIYIO7celjHZw=; b=DublL+qp+qzACYVWP8jRwsqXLblXizA5kd+HTjX976jNtldwSCmQq5g+ViQwTGnSAC e/1ws+PnAEYeHs1O1+nptnjU9V40MbFplP/E/rNV0p6Lu1+fYoJIOt9LOfNed03QzXj3 R76FUvCgTkgpPYAdu6tSVbTjQqy7NTborTwoo1zrF4mTO/UEWR4Rwo0U4lDSsFbIzdTp xrxbj/KVRSTudn2OtL6s4FlAvpu1eOWsQ0D+kUkO5z9RBv4H1zd3TAFEVY1l1ycv+Oz8 ZAsQ5Oj78I3WYEPPkpAO+KEClJjSdMOhICQV53xelPQ2uO1YQcCMYUkY4SF5uctAiDvK LITQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731857870; x=1732462670; 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 :content-transfer-encoding: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=c+sRoSUE7Oqly7m98fCB8UDFg9E0A9dIYIO7celjHZw=; b=TCy6Z1AcLWlvwWHeL+JrC0ThpiAKKW/GSr2bxH3Y3xlDbjs+qorFiRQoaSpNKqppMR OREL9k2wNXpBgePLQvxAPmxC1X0TukzhME71sRWenOBEW1XxewDpmz6h/WQVuat9cmyf VzYtEfFlYukyMUmh5d2IfyT+h+Y80QJjzbKfvUO+pf6L6AhovXbeogcdBNogLSvS+uBL u0MsYxrAn1IxrwimAoT7lZtIs2PgJ5zXZn7YQkhVGRbmsJE3kxUg0fAthg05154MQ64P W3eGTkahAPB/naH5fgf6q5ifV8kSYLZTe3wEMlibMkPBcOUgh7AlEknmUFhZm7NM3Np0 eVwA== X-Forwarded-Encrypted: i=2; AJvYcCWd1/Wxkp3bwKGvcx9sXPpRL1XSlg1JS1Jmas/VMbjqdYc7mBjUY2RXSp6LYhImLt3eV6NoWCk=@isar-build.org X-Gm-Message-State: AOJu0Yxup/AP+r2DS38xWXI+QuMC5DioDjmX7jWwKac8Iv9m/h3TdNZX n6SxYGBFW3AZ1HzbohPDwXtCrbX1KV3TL18ntzhBVNptc7aK6lJr X-Google-Smtp-Source: AGHT+IEhPxWvT+837cJF82v9ibvAFtGQCyRY2n23jlSzpTG0uXZBYGEtDrPW61B80J6LoWKiLlmVgA== X-Received: by 2002:a17:90a:c104:b0:2ea:33cf:7341 with SMTP id 98e67ed59e1d1-2ea33cf7583mr7555502a91.1.1731857870237; Sun, 17 Nov 2024 07:37:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:c088:b0:2ea:4150:3f6c with SMTP id 98e67ed59e1d1-2ea4150429dls767308a91.2.-pod-prod-01-us; Sun, 17 Nov 2024 07:37:48 -0800 (PST) X-Received: by 2002:a17:903:990:b0:211:efa9:a4e6 with SMTP id d9443c01a7336-211efa9a9d9mr74068225ad.23.1731857868616; Sun, 17 Nov 2024 07:37:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731857868; cv=none; d=google.com; s=arc-20240605; b=B80+sm2p3xBifbO/5ki7yHtASeUNZOQfntNmA4OJwO1lc0RWpiA8oX03Yn90Rt79FY 3b5AgmIzKEZyeqpDwfyRgLx8K7WI1Mm6emRQlJNA/w+alcsy7i6hleJJXI8n+fVKb2RW IYC+8D5vpGZVL5UjHJQJqpyckeCQeQRM3eh3GXZrZztcPlpwO5M6k/b3NK+7AaV9gZv1 Hu/InaVn9R559eDkJftb5TxETuxnxQ2Q5QiGw4ZQoY3q9jYpNKXcX4b8uhxmulCOFbjH PX+FDvvR/bq6ZARID6Qzw2E1qtrBLalmekbXZvidIrGpRQAhtcn0w540Sl96TP/JW0UC j1lw== 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=PM3qmUD3mFnMbFWRat8kkzPyhtyYt9vVstliFPa0mkY=; fh=igWmETGOvedG5K4n7Hi/ZweMTE14AVmQQZ15AkDCNIA=; b=U2lzvrGoTiY1G281iQ4DXr0r+uKdaAaalL4WZ6oNJE9hlTbJvL3JPaSCK21w7rhiF9 nx4QGvWpkxggtfTs61/B2tsblXy/+ZD37wumsU1+J4nvSrO2upin+3cIWwuW6vBW2M0I ZTuafJR7eQXAUzxR3F1nQ5m5pLZjIkdMni28+mumdaDq1+WSMVamkskepDmwRtgTCpLS 1kaE7EgC0kBwvMEFFJL5Uh2NflyJbQUqAhRLfv68SBpHcOSYU/fGg71wzsnk4IHlhLjj QgKOfpcY+c6uTckxHC39cV+qBDvsnWEkTndz6koFbEUSbkuvglq8MdLclcwtHxjyMQBE erWw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KzAYZn7j; spf=pass (google.com: domain of fm-1324425-20241117153746014a4e3a669eef14b0-xt7vkp@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241117153746014a4e3a669eef14b0-XT7vKp@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 d9443c01a7336-211d0f2dfdcsi2301965ad.7.2024.11.17.07.37.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2024 07:37:48 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-20241117153746014a4e3a669eef14b0-xt7vkp@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 20241117153746014a4e3a669eef14b0 for ; Sun, 17 Nov 2024 16:37:46 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, cedric.hombourger@siemens.com, srinuvasan Subject: [PATCH v2] classes/repository: use the proper filename to find the packages under repo Date: Sun, 17 Nov 2024 21:15:15 +0530 Message-Id: <20241117154515.906833-1-srinuvasan.a@siemens.com> In-Reply-To: <2e8f538fc2a14f8f235819e33656fb6e2a850012.camel@siemens.com> References: <2e8f538fc2a14f8f235819e33656fb6e2a850012.camel@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=KzAYZn7j; spf=pass (google.com: domain of fm-1324425-20241117153746014a4e3a669eef14b0-xt7vkp@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241117153746014a4e3a669eef14b0-XT7vKp@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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,SPF_PASS, T_SPF_HELO_TEMPERROR 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 This patch fixes the issue in repo_contians_package function, here we are adding a few packages to repo again even though the repo already contains those packages, ideally we should skip those reproduce the issue: 1. Create the base-apt 2. Again retrigger the base-apt (assume that there is no changes in the previously built base-apt) here we observed few packages getting added again to the APT, even those packages already available in the repo. Basically few packages having the epoch version (automake, git-man, ssh) in the download folder, but the same packages are cached in the repo without the epoch version, due to this mismatch, it tries to add the packages again into the repo, to fix this issue, just find the package name in the repo without the epoch version. Signed-off-by: srinuvasan --- meta/classes/repository.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 28e712fd..7379658d 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -99,7 +99,8 @@ repo_contains_package() { local file="$2" local package - package=$(find ${dir} -name ${file##*/}) + file_name=$(echo "${file##*/}" | sed 's/[0-9]%3a//g') + package=$(find ${dir} -name ${file_name}) if [ -n "$package" ]; then # yes cmp --silent "$package" "$file" && return 0