From patchwork Tue Aug 12 13:02:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4273 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-qv1-f62.google.com (mail-qv1-f62.google.com [209.85.219.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57CDoiZh020821 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Aug 2025 15:50:45 +0200 Received: by mail-qv1-f62.google.com with SMTP id 6a1803df08f44-7075d489ff0sf104418046d6.3 for ; Tue, 12 Aug 2025 06:50:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755006637; cv=pass; d=google.com; s=arc-20240605; b=btobHk6Q17R7Vd2E8AABuPB9lpn48bTB8LZ1ONncpp1rIyy1mPaMDkUUX/riMUrRe4 L343J6VUWrpi+L2LN2yQnW02mXkNIOYNG65S1NUH+/Oncf5MFMzM2MY1s1HUmqunzc/O xNNZe4bs3tmKo+SNUjnbWOkeLc5nt4gClly5t+OQI+8HTS10TLSwaCX6ow7aybWNsGH6 9D8Be9W2uQO5wbdgpdh/1MS6MV2doDQvz3s0cv0ogOJygNRz1W9s8Rxx1cHSUzUFRCBk UkJxUKAsjXhSCKRb57P6HR8IA0ILIvxLLFsF8CAEbiD4+fy0o+0knptDSznHGu+KPylp ZTvA== 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=n4fliphs0DOl7k9d9By/1bpzIatwYc7mouaQJRUI+t0=; fh=xpP17Z3FzN7nv4kZOCODIu6WGfzX32TCEHOeVAlbb6M=; b=laWvsWmpvp7dSQjokRuF6kCEudwyqeTJg+L7A8JD09C1+hvIEczjXLTiuLwhZA0Wpe 9y9IdZjKrK4K6IxhpDETqylV9W8E8Uye4veLZNnn9rOXzgL7WHCnzgRLkYUINsUs6J5q 3C9SWxpAphC2+eEaCNfuIqk8e2TNTNih1EjRyciOuux6CRbn+5d/Asj3ScrSddSiaJVt 3I3YRxUxyXbpOU0fK2KWvB0xXlP89jNwHS9/7OfTfg2jWj0T41yjy96miI74igBcfWi/ v/ocAMx4bBB2H0D7UN9BmpD8+YYIbwsYL4xmiNMMLyD32HXbsn3SfYVMYgBC1Lh8gMhI 3UOA==; 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=n4fliphs0DOl7k9d9By/1bpzIatwYc7mouaQJRUI+t0=; b=JUSq0i56x5uddHg+KNMUAZ2cyPQC3hF+07UrZqgbpdw2oXMiJYQ1ONsGhDtK9imTzs dyrjDJ0x+reYl08sJszrJZJ7zYWYk9/X8mGowUauL4MjmuimZRrVG2w7EXyg1mClfJaM SKPT5YNocYWJhVUUQ+3v9RviiKO0AHKUWRd6G22M8NzWS+Ja6KQlg6OiggLjINroYSsU XQwrYu15IdLDcjhdhSfxyT7go1qjl3s904Udip7+75M2Ehu+SAdtMXg0UpNMeYDklcwa wmZP0iDLLTA+fAW0Wxxlyar9klFUtBW2LeX1gapDEjwTjqkrMes24vmaKbX/t5FYlpFF E/sQ== 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=n4fliphs0DOl7k9d9By/1bpzIatwYc7mouaQJRUI+t0=; b=R1m4+2v12Kc+7i1L8jdb47HpPXg6R0kuq5fMqTDNd8tcLYDZ+z3Hrqd3UsZtfB0zwX uJo2eztecIymUWvz+YsuEXHdAXKkApXqKGSjFlpwXrT4qWlefBIkYYt1BXjQMRklbleA FN6GMtaCWyriY5hRg0IK+m/rn0jG4g2hpwJqhyzcaSAQpM9y4TwX9yXKE7J7bNtufZui E+i0/5Wc+EQz1nfhPaIn0UiwSMfe5gg32MyCesLYIt9TEK3ujfW/Y8hiy+4vPQtwyWKT G76U8gWq19O7R59bzjzME1GAGGti3s4lLwII/KJgs0H9jnymlE9EjTghK1VSXXk+poj/ upjw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXZ4wT38GacGg2/2MJyhRuPOFeCVmXvHFuuuAUDUuoG7iqziMiaSEt6vLs69mKCoYrD2lpQ+FE=@isar-build.org X-Gm-Message-State: AOJu0Yxzt2+T/0Ry7/iPplgQ5yBfOh007sh2GGNcrYvOFGjTDXNVVHQY BH3zgTUcvwJbZiiRVS13OIagzzGkoYPAZjYk8WMijO8WEEIDy39yBL24 X-Google-Smtp-Source: AGHT+IE43D/yy7ESVCWURkExKZTImKiTPzMS3A2x+oxwW5MqIw/9ynT3p+RkGXILaaZqgFUWvr50FA== X-Received: by 2002:a05:6214:1cc2:b0:709:b6a7:6046 with SMTP id 6a1803df08f44-709d5e0ef91mr50145806d6.39.1755006636818; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZdF4jIylUqF8O6RaN6zeVJpZvWeu2SNSVVL9g8rMdQMzA== Received: by 2002:a05:6214:4015:b0:707:56ac:be47 with SMTP id 6a1803df08f44-709880b9e29ls83199686d6.0.-pod-prod-01-us; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-Received: by 2002:a05:620a:5792:b0:7e3:52f6:66e5 with SMTP id af79cd13be357-7e8588b229fmr372680885a.35.1755006636292; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) Received: by 2002:a05:6402:30b4:b0:615:7ba3:3fda with SMTP id 4fb4d7f45d1cf-617e2c49d7bmsa12; Tue, 12 Aug 2025 06:05:07 -0700 (PDT) X-Received: by 2002:a05:6402:1e94:b0:618:35cd:8e19 with SMTP id 4fb4d7f45d1cf-61835cd92b2mr5571972a12.26.1755003905132; Tue, 12 Aug 2025 06:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755003905; cv=none; d=google.com; s=arc-20240605; b=WIcrYWF5wrcneIahI3W896XBw1AyCb78/aj/l+yJ9o/fIJjnq16NNdcgXRz9ebXyoH ZKx5IbB6PHTfq5SHdAgKtlqlLdtMRzeA2KDstfvG0v0kWHVWQ+KTAZqzA6CKLQ49oy/Z AM+ocAf97dt93aYsY092FLJB+i2nJcsqIDQBdL4YeTE1LfHLjVnNyaoS13ITjTs0QNSG Fo0nIhJArHSMEOmF6of2L7JWujpE2cJkt4jyDB2nreNzlyuf58waAs6MJA5RUppBhElP hhjSlzI4m4GE2ii8jTkanxgm0D9GlSW0omQH1PouBnvPizv4AZnRY2V3svFJN67aRl8z 9yuw== 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=zx9UlWfZXSE6i6IGOSvbul4D2QLiyHCunw2LQE4cVXA=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=etJYYmk88e7vPvvbWNz14Si5QhqZuLnlFrxvfVmC8VyWqDOYJj1Q1qoVpWRwfbyrLJ X1cDO/PljQcvUSSPtVl3TGmBgVruEWofGLPS21VmyVAQHlrkWq6ptz9w0p84imzTZzNo WLbIoTLQB8DiGi1KQL7k7HJDlnqhvL6+7MtTmS98wRdg8NXqDjrsXbUOFYFmXZ0LtvNi hN3cVm7FAJCpzpKjZ32NK2pZnkN6T29qAAPsZdB7JH+P3STWrMJvP8cW+c6UMnA1KOlP wAAU9xQ6EIIV/Z0ukMWc6yd09w6TdWnIklGPpADix/vtBpVUaBVtFd9ry0PW4z/S/YN+ PPVw==; 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 4fb4d7f45d1cf-615a9135373si569282a12.5.2025.08.12.06.05.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 06:05:05 -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 1087E5F8CC for ; Tue, 12 Aug 2025 15:04:59 +0200 (CEST) From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH 1/4] mmdebstrap: Make use of defined variables Date: Tue, 12 Aug 2025 15:02:46 +0200 Message-ID: <20250812130249.709960-2-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?= Signed-off-by: Andreas Naumann --- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 931f6f138e..42d99756a1 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -106,12 +106,12 @@ do_bootstrap() { if [ -z "${BASE_REPO_KEY}" ]; then line="[trusted=yes] ${line}" fi - echo "deb ${line}" > "${WORKDIR}/sources.list.d/base-apt.list" + echo "deb ${line}" > "$bootstrap_list" line="copy://$base_apt_tmp/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" if [ -z "${BASE_REPO_KEY}" ]; then line="[trusted=yes] ${line}" fi - echo "deb-src ${line}" >> "${WORKDIR}/sources.list.d/base-apt.list" + echo "deb-src ${line}" >> "$bootstrap_list" # no need to sync /var/cache/apt/archives if base-apt used syncin='echo skip sync-in' @@ -137,8 +137,7 @@ do_bootstrap() { deb_dl_dir_import "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" bootstrap_list="${WORKDIR}/sources.list.d/bootstrap.list" - install -v -m644 "${APTSRCS}" \ - "${WORKDIR}/sources.list.d/bootstrap.list" + install -v -m644 "${APTSRCS}" "$bootstrap_list" syncin='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \ "${WORKDIR}/dl_dir/var/cache/apt/archives/"*.deb \ From patchwork Tue Aug 12 13:02:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4271 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:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f185.google.com (mail-qt1-f185.google.com [209.85.160.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57CDogHc020784 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Aug 2025 15:50:43 +0200 Received: by mail-qt1-f185.google.com with SMTP id d75a77b69052e-4b08a2b3e83sf164765501cf.3 for ; Tue, 12 Aug 2025 06:50:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755006637; cv=pass; d=google.com; s=arc-20240605; b=IoQcf0z8NHJnrTpvkmsMV2VQ0Le3RGu3yBk43VqYTE2MBU87AAk1kj5syH7ArG5Jy0 BCTMHHRQKOqgUlnRgCNj3/0KmwrARrDPSqHmR2Mpqcqp/auWrC4E4JcaxYDHnTPlzFut kzb4r4UlQFERI8drF9xOOY69xwpM/DY/AbRlLMo8R2KrkXWDK49ex2MZwRvQCzgHSOUE 0e+Tq+UggqciKcpnZ/7u9UrasikMhCtuf3t64wMeP+ruqeAt0ho+8qFRJokBuvLITqbN 76jrAnYGa3xel8Gl14tEt/NsGDYXIwkBrbs/hIhHpOgQX2kPaPipqRijEjlqIoHuDUrS SClg== 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=tQJnEstndHaiXpbYORrOALmSt5XPKeas6VZpdISw4mk=; fh=CLO/976mQJTC8RlsVWiuxAJPwX92wH6JbKTsnzjRzBc=; b=FgwtZQyr+sAQsCX63ThwZaFDYFyIdZqf/LAVEBL2Y/s4UcHH2uMms1RobN0cjCATLK cfhcaknO5inKK34jBhFwOTf9M6oaeqGksDxSlrLV+nYBMgvijh7l91UcyqjBJTZcpVhM 6VUEoW0YxwQHbrQAzaG3bWtQtxgN1LXIkS3XYrYcW9JLIAtUrlyEwHZiSNQZcTdZwTyq iP8vi3eSXlK9ZKu1KXdTP6A31wOEvDgrQIp6pyQBXWff3aFfxay4fpvCB/rIRoY5YKzm vuwNiFGXl5YP1PxO4pp+xKuqsxHXsHy0o1hwL8cexeZbIWbXEIXCvESBy2mdyP+u9QRy YnbA==; 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=tQJnEstndHaiXpbYORrOALmSt5XPKeas6VZpdISw4mk=; b=BBlOZH8UE/pTIT+ydvCIsIWUUApfy4v+uuSGo+3LZA7PUQ4JlUgjG7AGZNuQCoPt6Z PcSWtr+zPnk7sZfA67kca07BJ6AMFE3k+Dr96fyBRXkukTCvbjoFWtSlSwxNgArkJIVu 5PxIgIy2sZQCbjGVU3i8pudOZJU2YxjSGJ2+DnG1ncF0foPLi9g1bQ1PUzB51GDUTat5 APVgohM2vRm9i5FsYkC4vyrgItukCXuO7RtDbfy6kV198+bI/M4SfjnwnqTMGN1Ci1vP o9WUCGfWjaM4nTQW11Icu2fpgZP5XiXeDJOCRyUQV5AVtSpP8gACssFHtk3vKGkD/wMl xYTQ== 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=tQJnEstndHaiXpbYORrOALmSt5XPKeas6VZpdISw4mk=; b=Wyy15WVAtVcfv5gqTweFf3W8SmkavO68LTEmIy3Jr/JAax479w/0k2QBbts2UTg1Z9 AXtAo5HTjnuvqtPn+6SIne/9VaYCN9r++ErGrzqAzMcO2gbx4hXPiWRqVX51ngdd7Iak BNCWC4TUWllylGYPgnaWFfsREF0aCzJa+uqTy39vqClxVd9wldtHOPv+7ODJ/h0ZCz6L TXfPCQ8iqgLH6zgfKP5FCOXL4G061sBktukZDjuYvGyJ9nLlX/pj7FrXjZbpZz8M/O5w wrsmPtoXhkWF84w3RBXs6CV9XFA+lvhdvP/TPIw8X9p2YpWo4lhaVxT1AH0D7aO746Lm nLlQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXXzg1h51o1ZTO44LcEcI/QkQ+663f1lwbbKCAbswuBWVLrFElhrpsVbtmLb6hsmv3CL4dNriA=@isar-build.org X-Gm-Message-State: AOJu0Ywk/9Pe0pqwaIA6fcaUzfbjRAkdAoMQsXgJItIb1f1vOZphzUCs z56dUxeQZiksC0bqOtxyL7ULvEIppHYXOS2Bzx9+EZfQattiNlXAHvNW X-Google-Smtp-Source: AGHT+IHESqFVo+NSXaFmA2+Awd2ZkcKQHiaCtW0qcBxfmqog7jbQH06yK34f+BorO4OfAn3r2xaLJQ== X-Received: by 2002:a05:622a:59cd:b0:4ab:644b:885c with SMTP id d75a77b69052e-4b0ecba7b21mr41327681cf.12.1755006636791; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZeIlzVx2Hc8sLmoSbNt+NNR57J2XPBNW+csyHYFWW/pmQ== Received: by 2002:ac8:5a16:0:b0:4b0:7448:c7ee with SMTP id d75a77b69052e-4b0a06d99e0ls91532781cf.1.-pod-prod-03-us; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-Received: by 2002:a05:620a:5ed6:b0:7e8:1b64:2187 with SMTP id af79cd13be357-7e858897007mr455094485a.33.1755006636296; 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:13 -0700 (PDT) X-Received: by 2002:ac2:4e08:0:b0:55b:7345:8386 with SMTP id 2adb3069b0e04-55cd759b366mr1036731e87.17.1755003910926; Tue, 12 Aug 2025 06:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755003910; cv=none; d=google.com; s=arc-20240605; b=MuJNGiuLbaXXWvzHDUzwzqEImC9sVLGKXDgmjXtSxjKn4yLiG844/rcQhhfX8HZIY6 QarO8DTptu7leUTSsSjLGt0YVUgEkVHB7snm8ouTPeN6gKvLeuA25ieAJEH0ui47Kjnb kWPSGl04vOoMG5YHW1SnZngTt27/82Bh3JCrAGbqS8hEuT6mH/miIJeQ8oUrtJnn1HrP RhCnzxOuZDjMTf3Axu1jbmUsaSPccJnvKUrj6txF5TK+rf53epk0Y9qCmlBQ+1Ce0soq PVVSXNXXSaZ2AEZzIhYTKZ7xOCiliII4BBS/P4sI1cQosQiJ1o8VlB38jCGzXdrrQsZA 6GjQ== 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=zbCQCeuiqvb/Ykq6cInfue0SoIi53gSTrKPyoy6Heeo=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=L1rIMuk7t9GDQwi0SVlL0z527PrsMJDb1yqB+n3A6a9/Py8+C1TqG6XF5k3IYEFFRs uwwzvUFdz9cahiEOXpPjeGEV2yUMp++nWwRb2Ng4zD/ifwFQpSvFr+9tgRUwQFZ6k0nB F3KIcBRs2yNDAKquVjUAE9Df2gi4lB439tT9+FU6SsNWPaewZvaW4tGFJiwBfNILJ70o Ew6a3UxWQrRqlmqhNCjkSs/CwVoZ6CClWnv6qCIlyBxLMnWxl4ZV86J3DG29xaviaYE0 Fbc33eoEbpILyJUGmY1UYxViZf9EpXeDX3EG2iMc7WWVP4NaCuT+tlGwD+bXACbQbRGf TABw==; 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-55b88929c9fsi673487e87.4.2025.08.12.06.05.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 06:05:10 -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 34C365F8CF for ; Tue, 12 Aug 2025 15:04:59 +0200 (CEST) From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH 2/4] mmdebstrap: Include isar-apt in bootstrapping sources Date: Tue, 12 Aug 2025 15:02:47 +0200 Message-ID: <20250812130249.709960-3-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_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?= To support using custom variants of packages in bootstrap, include isar-apt as possible distro source. In order to avoid wasting time on copying, reuse the bind-mount technique from the base-apt implementation. Signed-off-by: Andreas Naumann --- .../isar-mmdebstrap/isar-mmdebstrap.inc | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 42d99756a1..b03ae7d772 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -136,8 +136,11 @@ do_bootstrap() { else deb_dl_dir_import "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + isar_apt_tmp="$(mktemp -d /tmp/isar-aptXXXXXXXXXX)" bootstrap_list="${WORKDIR}/sources.list.d/bootstrap.list" - install -v -m644 "${APTSRCS}" "$bootstrap_list" + line="copy://$isar_apt_tmp/${DISTRO} ${DEBDISTRONAME} main" + echo "deb [trusted=yes] ${line}" > "$bootstrap_list" + cat "${APTSRCS}" >> "$bootstrap_list" syncin='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \ "${WORKDIR}/dl_dir/var/cache/apt/archives/"*.deb \ @@ -145,17 +148,23 @@ do_bootstrap() { syncout='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \ "$1/var/cache/apt/archives/"*.deb \ "${WORKDIR}/dl_dir/var/cache/apt/archives/"' - extra_setup="$syncin" + extra_setup="mount --bind '${REPO_ISAR_DIR}' $isar_apt_tmp" + extra_setup="$extra_setup && $syncin" extra_extract="$syncout" + extra_essential="mkdir -p \$1/$isar_apt_tmp && \ + echo \$1 > ${WORKDIR}/mmtmpdir && \ + mount -o bind,private '${REPO_ISAR_DIR}' \$1/$isar_apt_tmp" # prefetch apt debs because mmdebstrap will clean them on next stage - extra_essential='apt-get install apt -y -d \ + extra_apt='apt-get install apt -y -d \ -o Dir::State="$1/var/lib/apt" \ -o Dir::Etc="$1/etc/apt" \ -o Dir::Cache="$1/var/cache/apt" \ -o Apt::Architecture="${BOOTSTRAP_DISTRO_ARCH}" \ ${@get_apt_opts(d, '-o')}' - extra_essential="$extra_essential && $syncout" - extra_customize="$syncout" + extra_essential="$extra_essential && $extra_apt && $syncout" + extra_customize="umount \$1/$isar_apt_tmp && \ + umount $isar_apt_tmp && rm -rf --one-file-system $isar_apt_tmp" + extra_customize="$extra_customize && $syncout" fi if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then @@ -178,7 +187,10 @@ do_bootstrap() { [ -d "$tmpdir" ] && sudo rm -rf --one-file-system $tmpdir; \ [ -n "$base_apt_tmp" ] && mountpoint -q $base_apt_tmp \ && sudo umount $base_apt_tmp \ - && rm -rf --one-file-system $base_apt_tmp' EXIT + && rm -rf --one-file-system $base_apt_tmp; \ + [ -n "$isar_apt_tmp" ] && mountpoint -q $isar_apt_tmp \ + && sudo umount $isar_apt_tmp \ + && rm -rf --one-file-system $isar_apt_tmp' EXIT sudo TMPDIR="${BOOTSTRAP_TMPDIR}" mmdebstrap $bootstrap_args \ $arch_param \ From patchwork Tue Aug 12 13:02:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4270 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:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f189.google.com (mail-qt1-f189.google.com [209.85.160.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57CDogso020785 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Aug 2025 15:50:43 +0200 Received: by mail-qt1-f189.google.com with SMTP id d75a77b69052e-4af199d0facsf166781791cf.0 for ; Tue, 12 Aug 2025 06:50:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755006637; cv=pass; d=google.com; s=arc-20240605; b=kcxBsJyI3SPUVqP1juer4MA+wzxYkFYDBgV5WJA+fZcQ6WNX1sltf5TplnRRdCYPic Pt3h0BxCJf+3vU6Oc1tIcMFb/RgzFw/dDr97fXN8RllPnt+5Sc/oNfOsbvqqCQFiAPfY uHe766VYG3BrXn1aHYucfK6pgua3Y9gQ+xExtic8LwaNB1Y9q6xkOoXIjoGFK6HvwMe0 zOCx6MQoYX4O/2Q3FEhs7xOCKHpZzQguOzTaeOMbPk+JbswaOa8E0cP7IhvyIahAQ2t2 CG6KXFTyRcHCUIFjg/LFDEgEpRITsKC3VX10IXgnuJ9B6VOG/rEKFdYuNMIz8zng9sBz KCgQ== 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=VqduHwq/zQs7tVvXK6XqyRztWZxyLgXMrtbyyafjhpM=; fh=NU0hGs5TFiOdQflgDaQWJIb1wskLP/NGQw3hZgO4IrE=; b=Tukt7BaQzvf/EUx2pkebPtpfoig3E7E/QEMZrxCD4UQiETX6fkRYVZPoS4ORXj8Ohh 9/167Rp7sG0uakxwT5QO0Z9mwa4VXrTcRRV5UUANtjk3CUlBtdVeeQmLwNGfrHMwpKrn M059x1p6e/ydIAnC8O5s+j9gHA7iIfYBvKAYqqCkEJFwrJqwk/+3oFFejkmRx95f6G9L q7TPLKZt+ZE6exCeQWdFcX/C/PJYtMuJFblD3IeKdKZ8Wyz6CwFjVYLrnimF3tR3015b NBu3EIjPaAESwIHzqiMQT3u6AMN5ee7t2+AeLf8+pUqwIOKfkS8kHz7B0KXFIUqHgVVF UO+A==; 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=VqduHwq/zQs7tVvXK6XqyRztWZxyLgXMrtbyyafjhpM=; b=HFxqMGiwi8P5Tj9kb73q4eFK33GMntZftccEwuNol9pKcfB5ma2xWLA+o9SAg+JJXB OoZmJyKF26aqaH9fUQlrq4/LIptDg9KSNBDdzwpxo55iUc1uRoyoEj0i9c2z73tZNYmQ 6E5OHceq1veHjjdZ46J0UtTxcLk+QyBDE+ad6x1D63bjUr77vWc5brcRVdD24MBg1WPR sRC9rwsZwBPZQkeSUYPJnoTEH4g0Ah4WxeCIcMSYGhwgu/tfIJ8w/we7rBBh64ojCCLh SoZVDSLT2Zilvl7Nmlx9ruAHaA5FMLLv2Wuc5sIyf+x8s7S2htbDc0gIjFsU4gXamA2+ E+hg== 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=VqduHwq/zQs7tVvXK6XqyRztWZxyLgXMrtbyyafjhpM=; b=X/kFraX6+ghRNVTHXBJlTS51nn431G4xJIjVUMAgGGKrtOIGytes/ADUWPMLdghHnI U2qyaQZd+tsv5l/vD5EnTWMRfHWmfP0VicijX2aw/BklVRd7Vkn9rakmhszgMvxW3Pon /kYO+Xu3AmUO6k/dD6TegjkZpWxeNxkXo1KEnEt12KGH8W4n4Ul+uwts6r4kR7z+XlV3 Y0wcXyEauilEBbYpfVTaWmDuInBc1kueB6EGERVpWCcU4jqx9FxEFzoh/xSsmQEkRPMA fj3/3p05aQQZIUccAo7Rbd0jCYZegg8/mI7dOiy2noE3IfcRV/KnRXp1HSNYsadQ08dm TcYQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWGkjR6hp/HvAHhluZ20RA5HPHjcbMveuPWCSLJeT26mMRQXbYH0W/RdmVYLn9woLVM1J/brC0=@isar-build.org X-Gm-Message-State: AOJu0Yyngmj2daem0gKLJYG32oHym5pbCRXonhzhvMZ2yawEtq75fbvI ukkMnT/uexQMQvsndTW0aJ3EW3gghHG7T+Dfb4gEmrZh9+qgHlS52O0G X-Google-Smtp-Source: AGHT+IG7jW8v+/E2A8pfHv5WrF/HA2/Q13oAIh60IipbLC0LYnaylhppTRzN60NZyrYFDY/dT85Qlw== X-Received: by 2002:a05:622a:6097:b0:4ab:5d26:db8a with SMTP id d75a77b69052e-4b0eca4ceb1mr58468851cf.18.1755006636814; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZdZcNPVT3WuWIAinTx1Xc/N9OY+FSMKowBZ5RKNBxVhvQ== Received: by 2002:ac8:5f49:0:b0:4b0:7448:c7e8 with SMTP id d75a77b69052e-4b0a0509820ls58080341cf.2.-pod-prod-00-us; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) X-Received: by 2002:a05:620a:bd6:b0:7e6:3028:197a with SMTP id af79cd13be357-7e858df9202mr468857785a.10.1755006636295; Tue, 12 Aug 2025 06:50:36 -0700 (PDT) Received: by 2002:a05:600c:8b71:b0:456:ce4:c44e with SMTP id 5b1f17b1804b1-459f521d826ms5e9; Tue, 12 Aug 2025 06:05:18 -0700 (PDT) X-Received: by 2002:a05:6000:290b:b0:3b8:ffd2:22c9 with SMTP id ffacd0b85a97d-3b9111b8aaamr3245380f8f.28.1755003916367; Tue, 12 Aug 2025 06:05:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755003916; cv=none; d=google.com; s=arc-20240605; b=KXIH7ymDNQh3IVytWKsiBhRbzOITk0d1LHOljb5cpO77UXMVgdVwHfWCwqj1HsWEE7 kHlM+QZWVMVIvKo7XJCVTcEm260BMQzQ3rj8JUlUUodWE7KCMhdsKjTNETXJluQHEDnQ STKVBb5zOKVG8WYnbIpthp5AcZChZJXLeaFLTjzDSuuS4HB3jE5YZMkHusVDZKdZoxZ/ +wS1RMwiy1ga1TqsH52f0T8RaMQDjTf+pzC4TMbld0hgnYYkvS1Fl4OnKw/RLw2pnWEJ UxfaCBpUqqiCUrckIfNa7GfvgvLcZWm2KQ/KStXWT6azaXaJdfpUrLbdSP9MkyGiOVRP dp7w== 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=U8mlyBIHg9vdEInXAoxAUwaopX8hwsoFJnIz1vmRz9k=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=MZB/A7b467RaL4sQypCkTiP+Ryg51wh3Vnej0bQkAAy7e0acGxNZL5a1hFlZxkA8Hj Ut++VT+F1BJOY55JlPvlezkhEvOqV9t5VIFiWmTXP8daIT3GDlBXwohEZtGEYEGQmH8g rSrfWHs976j12kZhWaHLxV4BpvmWwxs2KWAz+1MVzf/fo4VukjtVbpyimKVwvyCWz7HA ZCQBIDeHuFxShGNJ/F3N1vKoxI7eC0JQAwcI3BacbpXvg8YAcKSzP0X9us9Sv9VJTA+R JzVc0ePELnp9dN23/PMPS53bI6MPMXzqbsPpz9GAQfeCw8U+zg14vpYYds4bMCCjEjXW 2m2w==; 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 ffacd0b85a97d-3b913c3ec37si23901f8f.6.2025.08.12.06.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 06:05:16 -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 5B0E05FA1F for ; Tue, 12 Aug 2025 15:04:59 +0200 (CEST) From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH 3/4] mmdebstrap: Allow for DISTRO_SOURCE to be empty Date: Tue, 12 Aug 2025 15:02:48 +0200 Message-ID: <20250812130249.709960-4-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_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?= For isar-apt to be actually used, mmdebstrap needs to be supplied with the correct suite name, "isar" as default. Introduce a flag which allows switching to use the suite of the internal isar-apt instead of DISTRO_SOURCE Signed-off-by: Andreas Naumann --- meta/classes/bootstrap.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/bootstrap.bbclass b/meta/classes/bootstrap.bbclass index 64702d5d54..ae1dec9318 100644 --- a/meta/classes/bootstrap.bbclass +++ b/meta/classes/bootstrap.bbclass @@ -179,6 +179,8 @@ def generate_distro_sources(d): yield parsed def get_distro_primary_source_entry(d): + if bb.utils.to_boolean(d.getVar('ISAR_USE_ISAR_APT_TO_BOOTSTRAP')): + return ["", "${DEBDISTRONAME}", "main"] for source in generate_distro_sources(d): if source[0] == "deb": return source[2:] 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"