From patchwork Fri Feb 21 15:48:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4070 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51LFn4wF015956 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:04 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-4394c747c72sf10649585e9.1 for ; Fri, 21 Feb 2025 07:49:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152938; cv=pass; d=google.com; s=arc-20240605; b=J6MnYjIcy/8s5inBQNsFYTk/Y1Fv7OOHdJgDNvQ2tz/wHXi+7GQROV9A3tfVjX2jCj b7xLjIFI32Xl0x46mdwxpE1UJO+B+j2TyFGJlnHS9HrikMiloFORIZWlyvSLGFgQgDjY QB/CoC0Ot9gdQy0opbdMb2Atsr9PbC4Ls8UrP55EFGo7p7qLAxLZGzAM2rSxqCRepVYP J8ubM4f7n6ZaHZvyp8pIEBVRw7sAYcsT02Kcj5Oi/I/sztUO1cmPx47e+1SQAYb+FIZL ZxgTvyR5KY6fNjq+CDwBadNEjlBov0Qutm4iyeWKgrRoueMPbizWxKKTC6QT0PCBv/2R 1KEA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; fh=jpRVUsKUWfZWtw59HB1+2bsgLFbmka5hMe1DYXEdPKs=; b=Uljr6/PsouMQfKJnD2+ESYQSS3YhINGvqbAT4V+grmXPu2eq4QIaQMrNJ0vrmwC4YN DiQZglZpgZHrf0SzkIWdEdedW0fyIlnLrqEO2gHkt+tzWJo6omEdhqiYEmraMlbQgp9D 8XrpY1J96n61Su8k2hyhdewqSG2J6w2SgXz7aZuMWbFSvr7k/c32ky6aedR+mOqIWQPW 073yhVu58Bed3El9bMsetjb77DIW3KfUggB08f45IlDfLOn3D7845+emG5hnwIxbcu01 a+d7++TckR07zbiT/UUr+2TVRKPnRhi/eECehnGN5cDSb09+zEVgow45HRuSdW7aJJnV rt/Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152938; x=1740757738; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; b=sv3FM2AFpL0jHodJ75jSKzzmcsQSahAaz3c8Bcx+8FV77HCFfSHhQSXjHnwGrd4SrZ x4zV45UJKfF4CIuGT2vHjijUp/zu3A/tszBKWYQX9klkwhYOKK+VjvkX7bfdoRre2f2k CicAzAPXOggU94OCW6dmFZ8l6fIerFAM2zogGdWz2inQi7/nJ+tqbdUe8CLKQtEGT009 YZ1G81XBs5UE58JDLJiyjI6K3MGkWhNTOK3CZ/EtPHAi0k9SB4WrX3mn+WrlZkqE4xuL 3E/NFWjiixO+VXiGZQFfmwEkg4xG4rUIjIblW9AC2n5RDvPp3Q2vrjUdDwnENvjaznzO +xog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152938; x=1740757738; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; b=NNNoI98IeUwkLZiMn/2zywj1uyPaq9hKceXkHnn5BujKCT1YXV6V0ymIyrjP0oP6rd tp+WvLzGDh3WNRVCc72Swzk/suQhlIlI8xUk8T+ldRIP3W5sjgCG3D66vmyh5pjHbqrg XVSsn9Jyy8rFXbSnCxDMLNfCwSxhbco++cDmLVNSDbksyJ20VEw8N2xY9mW4copaF8C7 xgig2/5MET2nJbLuOvBVHRpUV75PSPJGURbtfupZt4ywLmZSHpF3MKE6ftAs5Gca1mAu T1GSOGq/OPprcQxvLWnJbvA2L+88ytlC9zhcI6Y/+ETANhhkqVqk7z7cPrcp72NsOow2 56tA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWDDPFkZsgPDrfCrcshVf10J9e2jL2vZGZTkq89/Y8axz7sCgINU17kKgh712+ef+CWw0H1HIA=@isar-build.org X-Gm-Message-State: AOJu0Yw5gU1edhQd0L3DweKftrWXiC3rGKmXNct9DOjudn+lt0VsGCEK cSOi3vrNIwEoSTH8VhH0VbSUQBGHPcPp1fhYjoRDw8lF2b3CubRb X-Google-Smtp-Source: AGHT+IEjOO8MuyXiQRFWhSVcXdWC2koAoQqivXabLc8WJyAVGXq6x1mLz7RyWigbVU7veHYecKjq3A== X-Received: by 2002:a05:600c:511e:b0:439:88bb:d017 with SMTP id 5b1f17b1804b1-439ae1d96e4mr34757685e9.6.1740152937466; Fri, 21 Feb 2025 07:48:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVE4NBaSioxX6vvfgxDsE6AgciuBUZScuKjBE3IQLnzRwA== Received: by 2002:a05:600c:4b98:b0:439:9551:b4a with SMTP id 5b1f17b1804b1-439a453f517ls7461695e9.2.-pod-prod-01-eu; Fri, 21 Feb 2025 07:48:55 -0800 (PST) X-Received: by 2002:a05:600c:3b09:b0:439:8b19:fa87 with SMTP id 5b1f17b1804b1-439ae1d982amr35430655e9.4.1740152935478; Fri, 21 Feb 2025 07:48:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152935; cv=none; d=google.com; s=arc-20240605; b=Crl8rzlAwNbQNNgPFY6uJRzd0F4kzN7awF4T9MSMC0lWVKlI+l6SqhYtZpnMqZeQP3 hx17tOh7yt8eLe4dlEtoKlvVJp81YmEGTkvDl9a4bxN580zZg5twuom6Nvwr7Mu9GLEv Jwe34AoCQdJ9JOe8ElXSxlAkw9afSua5+GPXDscqHpJof6rzbdE0hzQ7vSmb3g0KSnLO EvV+TPZkJf3Mlb+NTJQfHu+028HpJMNr/RdWZ8R+B1vDfakwkzoc9ev5Q53w8qbvRIsH cpZM4Bydh9Rv7JlpZHF2yfrbvlaaVwFYHuJQGQM6Tb6bfWNEVTGE/xt+gbChdK5A2C85 J3mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=vPbfu/hzh980gWpDPupQ1Jkf5vlpYDjBSXkpfzPWgg0=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=HYzNYBrxlRdilhchIrFemv2okHyV5HLpDhzrkfm9XaKh9YKs2im60gFBkSG/DiMyUy NXDAiTcDXxyZvhJherem/ED8fZ9j95i/SxSjzktWOmbJZTccXHspm8X3UWV+hVD0m7MW 9Koh7aO/U8gw9C4THtoQYWA1pRRE4KGThsywNfahc/mV9KRNaEGjQwUOl4AvslJOl0h0 5xT0TscJIGvryog63AKYCXB2TM2JsqlpYg0uu5zTozI1PRQru5QJZv5ZN3f8J5dOH3lO jlr+/3jeGOeqF78VBqsdTsBCQIZKpjebh84oa/4e3+9pw3WMFSfiaQjcUj+H+8cB0FnI 06Yg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-439b0132594si341055e9.0.2025.02.21.07.48.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:55 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2t015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:54 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 6/6] meta: Do not update isar-apt during sbuild chroot prepare Date: Fri, 21 Feb 2025 17:48:43 +0200 Message-Id: <20250221154843.515037-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= After moving to manual isar-apt update during package build in 0e846829 there is no need in obtaining isar-apt package list during sbuild rootfs prepare. Moreover, it can results in out of sync between the data in /var/lib/apt/lists and local isar-apt copy of the recipe. In case of rebuilding the package already included into sbuild chroot this sync lost can raise 'File not found' issues with updated debs. Remove isar-apt update during sbuild chroot prepare and do it later for every package separately based on local isar-apt copy. Signed-off-by: Anton Mikanovich --- meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 6478d3a6..f5d1f1dd 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -1,7 +1,10 @@ # Common part for build chroot filesystem. # # This software is a part of ISAR. -# Copyright (C) 2015-2021 ilbers GmbH +# Copyright (C) 2015-2025 ilbers GmbH +# Copyright (C) 2023-2025 Siemens AG +# +# SPDX-License-Identifier: MIT LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" @@ -56,6 +59,9 @@ SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" +# We need isar-apt configured but not updated yet +rootfs_install_pkgs_download[isar-apt-lock] = "" +ROOTFS_INSTALL_COMMAND:remove = "rootfs_install_pkgs_update" ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" # Do not cleanup base-apt