From patchwork Mon Sep 15 10:07:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4346 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 15 Sep 2025 12:07:26 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f55.google.com (mail-pj1-f55.google.com [209.85.216.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 58FA7Obp010035 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 15 Sep 2025 12:07:25 +0200 Received: by mail-pj1-f55.google.com with SMTP id 98e67ed59e1d1-32e8c800a79sf72979a91.0 for ; Mon, 15 Sep 2025 03:07:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1757930838; cv=pass; d=google.com; s=arc-20240605; b=Lekgbdask/PM5k9LF+LKLAI4aKv0qFZ9EchSvG+XfWqj+oGYZ0mXY+1pI3pTD9ahgK qncY01cw0ISeJKnBqNyqaaFV25UWlNb8+Y9L9pfBjY304zZjEF5Hsmqhk7IF7OfrQIfp PQm8dObLqgG+uz9rWKsfdBZLVkteuEa5VSlFatLzsf2MmCD7VFLFeZ2K9yJY68D1fMy9 qRCQ04kIx5IkORnGi0rFDvtSRpaY1dpOgJd0v8O/flYuYKHt68J3TQ80G8f9AqOCfYvd 59YZBoQVpxGPhKLoTw2VgHnp3NedF83Ka9joDEqL+p7wIYxu+pvTkdRaE2BJuXRzj/dY NcxA== 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=LePjr4Y3tFZttusvKYR1TDgbo9voNjnFSHM6BsQbKXE=; fh=jKLp1e77oo482t7PhE6PmB9qUUW7w3V1kzYDkY8+c1g=; b=IwAG+AJCmPd7ZXyjmoUmWXoetca6EOaEYtdRiXp9UpxN0OrzMxuHsaIJe0U4SB7OiV TgZcvhF/N1X0qkZP1t3iXOiylBMOnojRS7LKhic3K8O+Wks+9g/Eo7bkxmlx7BcI9xU2 v9olYyntkdxvMaHBTUAbS68REPfwWPYAoT1sbohSzqcvrJXU86FfdZimbJrSkj584u94 QozQbtjP1a0B3ni4tTZjDGKj+rfH3DdndW4q1J7hbMY0eaCXs+w7TpsWrPSuwUI/m0a/ a+7cG0QCTEJdQTFaY3WSZBY4kwUJidImOT4ZnLsqK3Kx9Iat9aycydmJA5a6HTSh3iRf c4Ow==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=csFGjf5M; spf=pass (google.com: domain of fm-294854-20250915100714d9c6e7cfe900020764-bpehmn@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20250915100714d9c6e7cfe900020764-bpEHMN@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=1757930838; x=1758535638; 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=LePjr4Y3tFZttusvKYR1TDgbo9voNjnFSHM6BsQbKXE=; b=e6NJVamalW/YbcSMxqOzV2I6EooF9RS2qgsAr/zJlU7mnXUelJcZWlmFHnxyKwO2/N d7fZS5Nrxxcf34sNMDF7Ev0rwefGshk/C3p2viu7vTqI0iI6Hlgvrlpyn6odx8+dO9lL S3V3ywAhPW5sBKyqvQgg0H32qyB7mUEL+1xpeYvqFSI/adLNK48qrE2cteJZKxUXxpJi N4Xo2VAE2G7JTqVRh83sjC53dguzjEdil9/cWBddbeePi0c0BbNlewlWH6J/B2hurB+m 0u22lV17PgAbepASnoqoPjDyp15J7F/w9tQKZBQxXXSkmDb0HjblRAYSxCERsP7O5v2e FcUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757930838; x=1758535638; 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=LePjr4Y3tFZttusvKYR1TDgbo9voNjnFSHM6BsQbKXE=; b=OsgKMQlYfSU02qeSRFDgbQSw3hdv6/iddV0gGGcfGulmz9Y567wqQ8ORaPD78SIMSz 6BoElgwoVSM706WusYL72EsWmQwCfKliTT/WQaya0TfxPYggiLSc9CMozLv4Sh/0BKuK Xb4zGauI2papSNRex56hWPQ3HM0rCli9WN3aUD+JivwmA8djoxZ22fe2Pkf2si80hOQh w799vud/azrHhC+mMmnwItmnp4nj7DeaaMs63vhR6FAYbS0p7YYe2Ob/tmx+FiUGTxiE MBJ8/YZMzgxrpbuejmnc1N5ba5dtilkZmbY/9wGp1b6TzJkF5vQroksBNETfnlEpvGjT TyIA== X-Forwarded-Encrypted: i=2; AJvYcCUHju4v6mWDKewiegmPtILsIFhc/+i6qrcYwkgG+7y90Ymm+QVgd9kuXylKEiJ0AZeGJcnhJZA=@isar-build.org X-Gm-Message-State: AOJu0Yy2QfRxlfI8BUr4wXRGUJ72DR727e8u7Nay9TdRP3eHZ7i2YkCh a4ZE70hfEF1/XyeXFWKnyArkPwwgMhNwAJ0BYhbv4WtRTCq1PWz5LLZ7 X-Google-Smtp-Source: AGHT+IHRWegTx3c1fVhaAnS1fFYoarRyi5sokCFVKlelCL+tPl3UjjAhGPU3YYVnK1uCXUl+9ZehTQ== X-Received: by 2002:a17:90b:5850:b0:32e:32e4:9789 with SMTP id 98e67ed59e1d1-32e32e49fdfmr5846172a91.3.1757930837739; Mon, 15 Sep 2025 03:07:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARHlJd4NJWtISFSjX5ygFzyv7xhB6+7jF2micSmGO5dbm2Fdpw== Received: by 2002:a17:90b:164b:b0:32e:1c8a:4dcb with SMTP id 98e67ed59e1d1-32e1c8a4ea9ls2015282a91.2.-pod-prod-08-us; Mon, 15 Sep 2025 03:07:16 -0700 (PDT) X-Received: by 2002:a17:90b:5850:b0:32e:32e4:9789 with SMTP id 98e67ed59e1d1-32e32e49fdfmr5846086a91.3.1757930836144; Mon, 15 Sep 2025 03:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1757930836; cv=none; d=google.com; s=arc-20240605; b=KENniJj2w6btyCZiy2PqqQvypslUyIcGHqyHKNSJZ3XhnTuZeMAnhdTgWIQw3lREFF BXNhGxLgrbnAl1dXRIapplipUeIEJSEywzdY7VITZ82rxQ3alG9OzliDAoYpNGJga0X4 hDaM+nyI8/6t6bhcNHDNkno6qgMEoXq78zy7hqDC9O+QxirGh1WLB31d0oXFM9kMM9nA O/WXp4vClnBGYhF1FFEsVGuTyOWp9vON9vhenSuFqOUG+m0LRsC2Q3huDPX8ztIKkcAI B6pEl9TE4u+wQ47ZEwOpEl4C8giMNpcRWls+y92kWQuUuEywmTBb2ie0b8Rc+N4eDw6a iukw== 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=5ho1QxM9+yHrOwFfk1Lbz6+br23sBXAfvuvBYR11RTQ=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=O5Hv/LIkPt9wuQdB/7LZ0zLemjHrYxcb1wLfeeeh4Yrmz5eOD5+L1FahBAzGna6hH4 CxS/QPkLFT4CjAoJ/d9PiYvXz3L99uTCEIaQwlQw95FJPWMdY9ew/NXi2ZDY3mSJMG8D oUQ7AUUwnYjrbxZslcPMn27GDjZLjOGCMQDpNmkQYJTTHxHJIUvl2SJfg2MuKF0Siw5j bgP4Wwfud505KPWEIdyWCUTdcVLbb5cdMjkXJ1swzkNn9mrs9ENvmPuWc868cqdzsrrq eKurzZ4OPJ9IhY55of8kYe5X/kvUGmY3TZ83RUPzkyNq33NqkOtPgtJofG46jNjGqY96 TFAQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=csFGjf5M; spf=pass (google.com: domain of fm-294854-20250915100714d9c6e7cfe900020764-bpehmn@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20250915100714d9c6e7cfe900020764-bpEHMN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-32dd9508502si443989a91.0.2025.09.15.03.07.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Sep 2025 03:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20250915100714d9c6e7cfe900020764-bpehmn@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20250915100714d9c6e7cfe900020764 for ; Mon, 15 Sep 2025 12:07:14 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH 2/4] sbuild-chroot: Skip initramfs generation while installing build dependencies Date: Mon, 15 Sep 2025 12:07:11 +0200 Message-ID: <88ca507a0d71bcd597761b24f1862c9dc01b6cd1.1757930833.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=csFGjf5M; spf=pass (google.com: domain of fm-294854-20250915100714d9c6e7cfe900020764-bpehmn@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20250915100714d9c6e7cfe900020764-bpEHMN@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_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?= 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 d91fecb0..de8077e6 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