From patchwork Wed Nov 20 09:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 3949 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 20 Nov 2024 10:24:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f185.google.com (mail-pg1-f185.google.com [209.85.215.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AK9ObB5004967 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Nov 2024 10:24:38 +0100 Received: by mail-pg1-f185.google.com with SMTP id 41be03b00d2f7-7fb966ee0cdsf619473a12.1 for ; Wed, 20 Nov 2024 01:24:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732094671; cv=pass; d=google.com; s=arc-20240605; b=aiWd8Alvj5P22Vc9r0Jbt5E30kRmxPHTzTBF5F4mB6DUnQ0bL9ig9v7M6WJE43Zuln Cipbfxpzyl1/r5CU4iA54GpWu5AKOBR+KRX7jB7vejmESYVS9zy7tRaRB3MuluLqy7BU Gy8QKKM4dTCizvKQWlIE/+H+oYFUpNK50Suqn53S1zE/iiLQIcPB09rL9LF8hyNveT0K 0+lX535qVYc3SxHwQ5S3VAzEjE7u6UhYZCOo34wGrmgiNGYaGUD86cB2/N54CY0vK4Er /A0TR5Q3QuG4ZSOKavimOTqquRuzHtkbxTVisoqWUDbOqlY5l4fAp0dg6KgWCh04akGa 7aIQ== 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=3iViFYKTyxIJnhGonLbwW1qoZMKmAGiXDh2S62pN7KU=; fh=+Qhkxn1VzEIqZOBaoE2QPIC8sLF6+jpR/V2c4rEenvQ=; b=DdO8IFAwTK05tqNh2dxvoLrNNtgQdzVuuJ2al85L367D06CdHAQGoE1zJKgCPnPc9E ual/HcogCSkrO6+XfqdEV/EEBYKvoKqFW12/gYNN1QUYA0o86aKyh+uTG2GPEcaRYSeT x4pYbQAp7jsXYDNfThDyOAQGcnVTC30+ILTM7TY00tJ0ycmjTLPV6bh+vtghHfO7EN1e h7sKyVnU69Rbm824shCJ34ZC3wHW7RxRe2ck5iHDM97sEmL2HCTXxfPKUJzOfT9kypPW l7DAxkHnmorfLOOaLkshAY1f8qGDpH2e88useokPnlExis11f93eV57KSl38spTDagxl cqXA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=U3esCvkq; spf=pass (google.com: domain of fm-1324425-20241120092427f3a1642f66301f2b00-pltrzh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20241120092427f3a1642f66301f2b00-pltRZH@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=1732094671; x=1732699471; 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=3iViFYKTyxIJnhGonLbwW1qoZMKmAGiXDh2S62pN7KU=; b=oWcVhWGBXYVoWty1noe3ZIH3CKf7o3S8AeD7mHk4MJpEVoMgGXDAqA09mmp/mKr7YQ H5/bwC2K7esnUZ5sK+BXIWW2SwCjx5jIw+uQsNo6zXIGnzZdxC71eINhj3u43ZQNezTO eRs69hO1jx8LzNOdwcwjfigzSbfRF03E05+/A/zh6X8K8aNVfTvypsvZzhzUc7ZZUr0a se0KF/ezEXrteokfe3FAN68Ex9b6IJJ6JOBxipU1th4zIUxMRC5X0U55F/UQsgwda8tQ GEYPW5l4QHBIcmETtVAK/mBnSj9low9IaQb0Y2iQ19cTqAKBJRRX3oV6Ns73dy+78YYW Q5nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732094671; x=1732699471; 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=3iViFYKTyxIJnhGonLbwW1qoZMKmAGiXDh2S62pN7KU=; b=PmxLMJDMqBNCFzR42iqSfGpYgIu3DI4bzTOcONtKkj1RDBIWuDs2SyEPNpA5HedcI/ R7wZ7Eawv/mbLpTmAc8VYphqEe0T/kUbNBP2AepaTP3zX8mqjCjeSZX4DG/R4UUGFuHj ciNLm6LWPfcMkLPIlocwHikCSoSs1KNKN0MzFnach1FELuQBcQpV/V9smt+AaQodhnTz L82uBDpSzBPzAAPh+hJt+k3Ixty5On4qgbACvyac76yUnNkS0vLEFT9JVLLUpb+ZOv0Q dzIXvATyfCISXi+2qTtIppmUFK7Y8Ac/3WWtzYPmoT9BFKPOegxsWlPF/3osHmRi7A1e cIug== X-Forwarded-Encrypted: i=2; AJvYcCX9yc0CXTZ+GkoqTmKk8dkgFje0l1q1lwvndSrvb+TQd+za4amMGqnhfpsfT2mumExiAR27DP8=@isar-build.org X-Gm-Message-State: AOJu0Yxp8AHiomI/sjSFth1h2iLKnADnLA4ntsVPcEtJMKFNWL3HvMht ISB0YYH/n9SgKI1O/qUvcCxsIM6HliUIqpKP+z3u0Hca3ejs9MrE X-Google-Smtp-Source: AGHT+IHhc9ex8Ajpyj/5SJqS+cNotgjM5dEQZG9EWPta4o7XUOnrFvVvR7aQMAtTl9P4E7nFNQVnmQ== X-Received: by 2002:a17:90a:e7d0:b0:2ea:49a8:9169 with SMTP id 98e67ed59e1d1-2eac83c50acmr3893830a91.7.1732094671184; Wed, 20 Nov 2024 01:24:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:35c2:b0:2e2:b20d:f69c with SMTP id 98e67ed59e1d1-2eac82a250fls511652a91.1.-pod-prod-00-us; Wed, 20 Nov 2024 01:24:29 -0800 (PST) X-Received: by 2002:a17:90a:e7d0:b0:2ea:49a8:9169 with SMTP id 98e67ed59e1d1-2eac83c50acmr3893713a91.7.1732094669465; Wed, 20 Nov 2024 01:24:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732094669; cv=none; d=google.com; s=arc-20240605; b=O4clS95zbnWbpSAIEjq4j2cGhqgvkJ0g71ZqCZd9tmeCKXljE35GADktZVgdOPHUep fOKQjJPdHYLo62YiN4XvF3LkeXqXbiBjqsQ/W6APsUY7VI0JGRahaj/kWDgB9BchJsTK xlWB/QNkQLTNdTFpT5fY6MeGA8HNuzHG+1IPUoJx289GTbF5x9En2/7W0O5hmkF1ZjAm 9fYdtVanDmVtb7i3uNsep1TES8AQkw0jewuIcHXw+7vTeiQ8/w16/z+tLAwDy0nvVT4w kc9Tp2EDTgSfY/KIjq8aens+NZs4tsevozdvcpzp3TWrIV6hA16YGBgHTzh2mUTbq87M CPrg== 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=4KNuS9saXSphkCwmlmesZli3PTZGf9KsAtRHpX3c0FE=; fh=dgWaDCpY/tv5SbhqbFkBSJY87GRfx+1Pg6VhOTwZ4q0=; b=I1zO56Sc91vE0FeogMP2cCRTTuMaEp9GqMsc3EdzF+yvGEKPJM+39OF2Y0IalMQAT/ d6u6qZ+BoiBEB6s8ShAooERMH2Aj3Fvu2owdsaGxcCi7gJx8l+XxF2b7OELwduqLT+Y5 QVU1P35RKqpmwNiKyQgSvhk0qGJGIwOSOZC++yJqYINBuGxA2n41Dpewf+VSkWuLTlWi GdSEmrSIj3l/gnClJ/fJNfyZLmavJbuQHtQFT5YJ7V9jO1BOOQOhCVwr/UNznfpShdU1 9+62W1vG5kORYANMgnnXMj/6MIET4XxC5LXNzQyr3BFnjVxuPvwRaNFUcpzEjXDj/qWw xiKw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=U3esCvkq; spf=pass (google.com: domain of fm-1324425-20241120092427f3a1642f66301f2b00-pltrzh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20241120092427f3a1642f66301f2b00-pltRZH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2eaafae1d9esi361606a91.0.2024.11.20.01.24.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2024 01:24:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-20241120092427f3a1642f66301f2b00-pltrzh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20241120092427f3a1642f66301f2b00 for ; Wed, 20 Nov 2024 10:24:27 +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, ubely@ilbers.de, Srinuvasan A Subject: [PATCH v3] classes/repository: use the proper filename to find the packages under repo Date: Wed, 20 Nov 2024 15:02:04 +0530 Message-Id: <20241120093204.977261-1-srinuvasan.a@siemens.com> In-Reply-To: <47c5e76990ba95e85e07df4542d3aa74e6e002f3.camel@ilbers.de> References: <47c5e76990ba95e85e07df4542d3aa74e6e002f3.camel@ilbers.de> 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=fm2 header.b=U3esCvkq; spf=pass (google.com: domain of fm-1324425-20241120092427f3a1642f66301f2b00-pltrzh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20241120092427f3a1642f66301f2b00-pltRZH@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 A 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 A --- 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..043c8621 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