From patchwork Tue Aug 12 13:02:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4272 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 12 Aug 2025 15:50:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f192.google.com (mail-qt1-f192.google.com [209.85.160.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57CDohsG020805 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Aug 2025 15:50:44 +0200 Received: by mail-qt1-f192.google.com with SMTP id d75a77b69052e-4af18aa7af8sf146317231cf.3 for ; Tue, 12 Aug 2025 06:50:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755006637; cv=pass; d=google.com; s=arc-20240605; b=CCdJjSqNNS2vi9B4J44JyyyLGC9IIlQSHJlV/iZYW2djsmITdq5WMQosKi2Mu1z0Zo 3oUqM/cNTTW4moQs0RDft1K6MIg6Iqe3zKtINWm8a2iHyla1rOmPGuF5RsjmE/ArkxOx pOjl7QU3NXwE2scVUPvyLDibKSDHhvXlsbrZDNow8RADOa8+kFMOqP/CIP5uUfOS1e5l OoFfUj1eBr7L+xbHiyniNBnr6L9ux7tUM9IOCe+vm/075PVV9AAn2WfUS/6UpkL8Qmj1 o40iEaAghVxGT7UF/QcxlhnU+haByBhwWBCUvL/XZeP4LTC5On9G8ozRufwzM7kp1TE4 1UbA== 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=brEbhSEmShnuSPggbJyRpKHGVZiwapiP5GYVv5Ys2wc=; fh=H5Xop+T0X/dzVx3Q/xv9mR5zaTuahsm9CaMmZC0MQEk=; b=lirYOhGZLj+P8AelbXTyob7frTVjvz1/+fHI9Zndf/3kuRvJZwanVa1FY2eG2NW3iR /Z2EHWERv822pvoHkktk1RNFwtixSSzZG/MFoU5jpMyoWtGM40A5bJn9K6GsNJ6we5dW m1UH/sgkwox2vAcvx8QkdDipuu02SZn4ckgWyB7ZdlzXhxAkUJ/cVbhDFe+5hHm6xsDc 3+f5AttKWib6cFC6n1OLObF4v31y3yg+RLLVYhBXvrQ92i6dwbvxaOSetaABep+VODVa nQppH2ckbqVO1Bs/m7hXj7+CEYgFeo63uYNVGX01xsxTHChelo8KcbUNkYCA3xyCquDB L6dw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1755006637; x=1755611437; 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=brEbhSEmShnuSPggbJyRpKHGVZiwapiP5GYVv5Ys2wc=; b=lmZgBadUbQvZRdK1Pql6gItefa7CTgZC6kKJmeO7IvmLxOEh38aJwBVj415nlzor/y EqmiQ8Gdv0A+VT9/DXx/v3/gBMXa4BjDeTx4eFQe3+XEn0l0hGUhYEHtkeBxO/N7vJrp v9HgAD0Q1jgb3FtS2+BKvSvjpcIlI1fD1B/fqB/9y4thBmCDtK87A23E4F0bHU1Tjq9O +9M4ByBRK7a0sIiN9uOQ7WsEQiNF6BGX6AENPiXH1MGQykF91Z7hdOxEDJHPDUbwRO+M WbDMzGY/LS3dCdFXd3csYiFDDREXc+0zPkANXEVQdgnOy9t8xyfLnXfG+9iaQb5g4RYN i3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755006637; x=1755611437; 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:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=brEbhSEmShnuSPggbJyRpKHGVZiwapiP5GYVv5Ys2wc=; b=BzpZB1OHXRzn8NfdOAFuvXhXB4XcL3sYVuy2Gw8G9SNA4ecbiitRzVKutTo43lBUoy nwPdQR/IaXUFNO2lslST4YrMwMSAI+oDIIZE6TZMzO6XUBIsGB6Q1x3FQFJiINXycEPZ ttdySGMTYWlceAeEqHvjYgjRaoT0GHoGcGcAnpllRXZ1TMjQ5+nm4J+NrZodRdRTwLJM TYVFnBWzR5l9XFI5pNgmSjeGTdWalLAwrspSYowXgS9LB8qDTuxQmlRoHG2TGZTRC3KJ lbfV3if9VXj0HQVU8Jdwb0AgPhWtnkDkobjTcWxxtt6x6P1RzFLBFF2GLkHs9mfluh1A R/TQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXjR+BBRUTLBjKrRLAactyPZqsd/yMgW4bSZh/94FeCoLzUvQ9KY9wAGoXwV6K2gnJpJdkMo3U=@isar-build.org X-Gm-Message-State: AOJu0Yx6hofJlTPlbs8J/amFehUJb98HRIvnbMhnyftxYaCfE6ijdx5g ZO+wPNv/sbXGe5rnMEy9Q1JWgsoKxbq1wTl648uyvkj/iQtCI709ctyE X-Google-Smtp-Source: AGHT+IG1PHCbUJDFetTDDW6x8OQSivrIhFyOOvmyO+YkUn8meaJsZgd0rgbVEDEBzeyseQaTBieujg== X-Received: by 2002:a05:622a:4819:b0:4b0:7e37:cd71 with SMTP id d75a77b69052e-4b0ecc58d85mr41483441cf.34.1755006636744; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZd/Qw2E4wWWA1YI2nxMWTWkpYYhkxucrwRA3E8NHnFSIQ== Received: by 2002:a05:622a:11c2:b0:4b0:7930:aefa with SMTP id d75a77b69052e-4b0a071532bls99800861cf.2.-pod-prod-05-us; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-Received: by 2002:ac8:5ccf:0:b0:4ab:66d1:dcdd with SMTP id d75a77b69052e-4b0ecc77f14mr54675941cf.39.1755006636292; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) Received: by 2002:ab3:5399:0:b0:2b1:9db7:3101 with SMTP id a1c4a302cd1d6-2bf31f62929msc7a; Tue, 12 Aug 2025 06:05:24 -0700 (PDT) X-Received: by 2002:a05:6512:224e:b0:553:26a7:70ec with SMTP id 2adb3069b0e04-55cbffb5c62mr3627740e87.0.1755003921999; Tue, 12 Aug 2025 06:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755003921; cv=none; d=google.com; s=arc-20240605; b=ZM16mLXDxGTfQ+uCF6fwEtvMCP3WN/ns/NRryGhRmSeA+BHmz2THjnRfvewWSGMUoh 5UcDPPsq1ComeeaLpok3BtiE0Q7vQ+u+gYXQi6dAv8peMGR0Hvc816bTkHvVT/RpWb6O ivOy8nA3OxD6XxpWT9BkMyT7lqX6+KYzrRlPGP2AbMVKy0Kz2fl7Hr8ZTA0raRLt4Fr8 Hn1oMSY6728EWumjMd+n9CeAEKeSnQEEKz0wehQn1TUSPg+uKe6/2JeqoYyczCm64AzZ xU+hmymb3aRDyQV3VVA+ZM7IPcLM5godCcXj6k9oAa9033LphWaXZgj63eY04lmPkUPM qyMA== 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=+/m6SDtuNhPZ+wbWGM4prukEOHTz2rwQ2Vep97vFacQ=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=kqwfTHpd+crboMBq8qpQ2aNrj8mM+5FapHdMVgXySDbAqRFko2VS7h3CThpwQFpr/m b8ssmF+LhwH0fL6RuXCQ6sWQ9RmfAU6OnekhzGJp4nEPcErUIk1s6hHCBvlpXcZJlSh+ FquGd1C0o+3nUZd05tIVduaBJMFr6+RBXJ2QJUr1i+aVxT8528E7A1m+VXarTwB5270j ksRXJrzSahJ/onAXXmQPU1XbL5PlY1fln/qWbHs2O2wVUaa7GgOK/aia6nujWnHkcaEb vx7cIRjU/d83lchI6pq0UZwWcosiKcDsoC067a8dgHl2PZIQU4od0u7Yb7Y22LPF6WTH vVEA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com Received: from mx1.emlix.com (mx1.emlix.com. [178.63.209.131]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-55b8870e498si808852e87.0.2025.08.12.06.05.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 06:05:21 -0700 (PDT) Received-SPF: pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) client-ip=178.63.209.131; Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 7D4475FA9F for ; Tue, 12 Aug 2025 15:04:59 +0200 (CEST) From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH 4/4] mmdebstrap: lock isar-apt while bootstrapping Date: Tue, 12 Aug 2025 15:02:49 +0200 Message-ID: <20250812130249.709960-5-anaumann@emlix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250812130249.709960-1-anaumann@emlix.com> References: <20250812130249.709960-1-anaumann@emlix.com> MIME-Version: 1.0 X-Original-Sender: anaumann@emlix.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= isar-apt must not change while we bootstrap from it. Otherwise, e.g. if a dpkg recipe deploys a deb-file into it, the Releases or Packages file may not match the hash which causes apt to stop with an error. In order to use the bitbake lockfile flag on the entire task, which is preferred to a flock-wrap around the mmdebstrap command, move code with conflicting locking to a new finalize task. Signed-off-by: Andreas Naumann --- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index b03ae7d772..885963fcc4 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -86,6 +86,7 @@ do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" DEB_DL_LOCK ?= "${DEBDIR}/${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}.lock" do_bootstrap[vardeps] += "DISTRO_BOOTSTRAP_BASE_PACKAGES" +do_bootstrap[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then @@ -217,7 +218,10 @@ do_bootstrap() { "${@get_distro_suite(d)}" \ "${WORKDIR}/rootfs.tar.zst" \ "$bootstrap_list" +} +addtask bootstrap before do_build after do_generate_keyrings +do_bootstrap_finalize() { # Finalize bootstrap by setting the link in deploy sudo ln -Tfsr "${WORKDIR}/rootfs.tar.zst" "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" @@ -226,9 +230,9 @@ do_bootstrap() { sudo rm -rf --one-file-system "${WORKDIR}/dl_dir" fi } -addtask bootstrap before do_build after do_generate_keyrings +addtask do_bootstrap_finalize after do_bootstrap before do_build -SSTATETASKS += "do_bootstrap" +SSTATETASKS += "do_bootstrap do_bootstrap_finalize" SSTATECREATEFUNCS += "bootstrap_sstate_prepare" SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize"