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 \