From patchwork Tue Sep 16 11:05:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4351 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 16 Sep 2025 13:05:28 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 58GB5RKY017293 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 16 Sep 2025 13:05:28 +0200 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-55f70a5c99fsf3188915e87.3 for ; Tue, 16 Sep 2025 04:05:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1758020722; cv=pass; d=google.com; s=arc-20240605; b=BbD03BzXeD/y8636RjJHdIoPccXXSzd58n9LoWBsfePOPprIK6eWzuXL3Be9GvCMFe bfEUwtJ3lHeTkTAaoZEpb+fiNsv38NbhnYdzXibgyzH+6eodn/htSerilDaRisfp8HZs q6tRwxxVy330qswFSbsVXdkfPKZpzSqsw+/Mk2ZzEE+fhAZCwHTT6bMKAPoYxnfi7Qnk VA6sEEsP4TrIMcBI4exkR3rxizMmz/6Iso9KEOvh7/4IsSaWCXCAVKCXs3kT4HtHpGjb cl0kPMB3xuu4zL9bgRs5KJqLiVrZRIn1SZ2HKcP+O2fNc2aNgPjZB0oiuaGrvvTJbWLe 5gOw== 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=34bRxWUufGAgjopPxjkSNPTD+2lZtHzGUtv07V9IJ7A=; fh=YjesSEXvEpBJGTqumCWr3pRKtRYKuJqhgSvmeQ1ZiZ4=; b=jGjpd1ZXltkCf9/krKWUPYy327p6SBYzLph7CClVzOxm2Y4Gygokr5e2RDftLZHkkM Yuc8aPzgJ0XacLKiVediaZuqgxL152J1SmDQ530SOqTYYf+KaYnT1RIy6eLnlIHjLn0O csDWn01qEtphpfxTMkHNE/4TXVu/J8dafNdDkTbJeOKlXKZkM8aiNqeV4QQ28wxgRVLF hY88R1Q5PIGYusKrAqV6qDMa3sWjIsiXjQNPR3vGAzKK9W58R5E0IEI9Bd/TsIXj2mhc TQ4/yV1JKxfebSCC6E/C4HhjuSATXknKSAFkqUNva4yHwl1d5dD6eGPaFYEPR5ryCiYA A2rg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=W1lWCq0v; spf=pass (google.com: domain of fm-294854-20250916110518ac5ff941cf000207e2-szhkdz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20250916110518ac5ff941cf000207e2-szHkDz@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=1758020722; x=1758625522; 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=34bRxWUufGAgjopPxjkSNPTD+2lZtHzGUtv07V9IJ7A=; b=MCglUjsRvXTOApaMe2Bpjn6TVsnpNDLsu0CPeC1wlD8NCERskgr+NoL6X6rAamdLBr urmhe67385S02fhjJB5SAZi0lF65Ht69u1CUV1vLOcATL7lqOQ27E9wAXzzyccsRdPQP SfYb4g839Hzv0ck1AAaQAO3dIrBPFkLc8CRrCrAQLr1FpNvbldFkG0gIi3Yxw6yTBrnW 0qCF2qt55S88CMIW2dIyqD/V4VudbYRbEJsN9YtwY4Q/lMZrFoX8laKZalDNt73BB6w+ 5sHbsXSX9kFwafvfSDD3HUSPwSzqo/t+Zy2MaklgHf6+zd+7Md/kp8qrdF8XVL72jwJH TikQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758020722; x=1758625522; 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=34bRxWUufGAgjopPxjkSNPTD+2lZtHzGUtv07V9IJ7A=; b=wtlQ6YK6xVCCHcj8lLNn5c9lfb812PXM5sh1vAMzqiBSZdhxbQ891QL9H7jjl+elLP D4i1gKmLxoK7poHQ91fXK9k+p8/8d8tyb8T1yJdJtcmWG47Oq06gQDHw19XT/8Iap8tZ NoURTQ7Xx22sqoj199Eedgma/+Ed/oQLh/rwcXacoKjx2inxxxvUbmpNYgapc9gerrO4 5IkstTGG6iF3a5ZLu45uREspeW+lmXMG8B8EvJeGBjqGODs0LFVStjGiNCxN1lEscZ+Z 4RkkVV/A2DTGPsnJjBIgQcDFykuPlIr9BPFYT11T1Jzd6Y9EztmbuILkPUysBtvDb4ug X8ng== X-Forwarded-Encrypted: i=2; AJvYcCVAyRViHMueYRR2LInQXtoSyPWIwp8sEt9HdOllN9QpxsRYWaMKppR99dSDrVNWxcJLnHSRY/E=@isar-build.org X-Gm-Message-State: AOJu0YyLIxofpvm2K2bvU3fgSxvzrulgiyH+ysQRF5cFc4Z+Q2+EdhYc tQhjtrblcNceaIUR8zeFSfdZD/jkCMbhET69wW49LP1NqvudIT3BTgov X-Google-Smtp-Source: AGHT+IFIE69Ha6c/M7lTQ7TcDTwrRHF9YEzQP3MRRGmQkNn0WKYvGA8AJUvVKMO/hkkgw3ThFEX0Fw== X-Received: by 2002:a05:6512:4282:b0:55f:44b8:1ed8 with SMTP id 2adb3069b0e04-57050df2e66mr4870564e87.57.1758020721886; Tue, 16 Sep 2025 04:05:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARHlJd4wjlOBv6K5eeo0cOLrmhAyUiYBuFxhYuhvl7Evkjq9JQ== Received: by 2002:a05:6512:4606:b0:571:9398:826b with SMTP id 2adb3069b0e04-57193a7c7eals1100041e87.2.-pod-prod-06-eu; Tue, 16 Sep 2025 04:05:18 -0700 (PDT) X-Received: by 2002:a05:6512:a91:b0:55f:71ad:5913 with SMTP id 2adb3069b0e04-5704f99bd5dmr4307526e87.50.1758020718553; Tue, 16 Sep 2025 04:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1758020718; cv=none; d=google.com; s=arc-20240605; b=SullUyXonTgdK1l6TCengzO5sqwoto0+ClZACoQnPUgbOPsYRBe0WTP0r4akajEQc+ /f29qQspdyBuFu/w7dBJzJBMovNHVAxFbB8n6/Kivj1VfIk42Z2o8cIrCppD3nAQw/xg gWLxlwC0CB8PYNYx6b+ZxLMkAO58rz5t+SfvJvUYsKr2/7B38sXtsKeKxOI1vJO/wa0D iH5lG37LQvv+vVwKWs6/hKD3JzBtyWRDzuBfbMG9dhR4ca1CFaQKjLX27YCFRrLODnK7 PB5zqO/L5KpLKt/gOh+SUdBZg9TOfQws3g8K7ILRDwEPLGK0wKIVrnD/2k6ybzLZbAA8 AGpA== 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=FiKhfdjzd12YG3Ugy8nkuYgxjFeNTWlbt9yb1nTGHs0=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=lZbAPDQ34/wi+scO/4Sm4UL/dAqofOCBIf35PyvWDrEMN8Ux//8nbIN1ETEqf8p7BV igmBvQ5atpLAg7LCt1OCV14qQxlFALlTzirBD86vGdtNnOOd+non1DpYQqLpc/Eo3Omp wMELMuBTBL1NSNswqj2IQ4ANDBVtjkN3fmqrRcdaAZUm9GmcGk2XNo5lnHmvSXOX1Dak Tzc5mGKG8Hz020qx8pgW0IMAdyFnvdYO1BaFQHTU2D6ExPZ6DyJx0c0peiO+8zmIm7Qh eWh/JR86xXbtfUdnItL7Uep/0yO8UDuouRWXv7/RG3wwauSFICH8KCWFDavsRzduq/Bi Oo3w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=W1lWCq0v; spf=pass (google.com: domain of fm-294854-20250916110518ac5ff941cf000207e2-szhkdz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20250916110518ac5ff941cf000207e2-szHkDz@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5707af060dfsi209156e87.6.2025.09.16.04.05.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Sep 2025 04:05:18 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20250916110518ac5ff941cf000207e2-szhkdz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20250916110518ac5ff941cf000207e2 for ; Tue, 16 Sep 2025 13:05:18 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 2/4] sbuild-chroot: Skip initramfs generation while installing build dependencies Date: Tue, 16 Sep 2025 13:05:10 +0200 Message-ID: <6671d79f89345830c6f87c876373954b130d100a.1758020712.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=W1lWCq0v; spf=pass (google.com: domain of fm-294854-20250916110518ac5ff941cf000207e2-szhkdz@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20250916110518ac5ff941cf000207e2-szHkDz@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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_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?= From: Jan Kiszka We have no need for an initramfs while building packages. Therefore, keep the update-initramfs stub inside the sbuild-chroots so that they are working also while build dependencies are installed. Signed-off-by: Jan Kiszka Acked-by: Felix Moessbauer --- meta/classes/rootfs.bbclass | 14 ++++++++++---- .../sbuild-chroot/sbuild-chroot.inc | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 956a6089..605d5e01 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -187,6 +187,10 @@ rootfs_disable_initrd_generation() { mkdir -p "${ROOTFSDIR}${ROOTFS_STUBS_DIR}" ln -s /usr/bin/true ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/update-initramfs + + mkdir -p '${ROOTFSDIR}/etc/apt/apt.conf.d' + echo 'DPkg::Path ${ROOTFS_STUBS_DIR}:/usr/sbin:/usr/bin:/sbin:/bin;' \ + > '${ROOTFSDIR}/etc/apt/apt.conf.d/50isar-stubs' EOSUDO } @@ -251,15 +255,17 @@ rootfs_install_pkgs_install[progress] = "custom:rootfs_progress.PkgsInstallProgr rootfs_install_pkgs_install[network] = "${TASK_USE_SUDO}" rootfs_install_pkgs_install() { sudo -E chroot "${ROOTFSDIR}" \ - /usr/bin/apt-get ${ROOTFS_APT_ARGS} \ - -o DPkg::Path='${ROOTFS_STUBS_DIR}:/usr/sbin:/usr/bin:/sbin:/bin' \ - ${ROOTFS_PACKAGES} + /usr/bin/apt-get ${ROOTFS_APT_ARGS} ${ROOTFS_PACKAGES} } ROOTFS_INSTALL_COMMAND += "rootfs_restore_initrd_tooling" rootfs_restore_initrd_tooling[weight] = "1" rootfs_restore_initrd_tooling() { - sudo rm -rf "${ROOTFSDIR}${ROOTFS_STUBS_DIR}" + sudo -s <<'EOSUDO' + set -e + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar-stubs" + rm -rf "${ROOTFSDIR}${ROOTFS_STUBS_DIR}" +EOSUDO } ROOTFS_INSTALL_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'no-generate-initrd', 'rootfs_clear_initrd_symlinks', '', d)}" diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 98e427e5..479aa91d 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -57,6 +57,8 @@ ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" ROOTFS_FEATURES += "no-generate-initrd" +ROOTFS_INSTALL_COMMAND:remove = "rootfs_restore_initrd_tooling" + ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" # Do not cleanup base-apt