From patchwork Tue Dec 9 11:50:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4706 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Dec 2025 12:50:23 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5B9BoMo5002169 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Dec 2025 12:50:22 +0100 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-5957d86f7f9sf6412677e87.2 for ; Tue, 09 Dec 2025 03:50:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1765281016; cv=pass; d=google.com; s=arc-20240605; b=ibkxn5U4p3lT7VrHbYy0w9zdlyVV0JkMuT6513apD1zxtBQ+uIvrOYSR6PLRrvIfO+ 80e7DNwFzZaZ1UB0B5zYvSh92NMKV7Qh8uTp8L/ngl4MlW9aLSDDKX23Ic2N45wi13t2 CQHg+ww5mXI23xR+P0P7yT8Eflu64IskpFWInK+2X5QxESeZU46p8/2kd2blA6reVjpB 7Me9kifKyZZ3g7HdGq2CCMj5G03F1Mnhh38qBE/s+CI8oXg9NEge7wgV9qx5r1Q++4pm xSOQ0Pzq4gjE5Q0W/Z0beiDLcF5AGsLqYHjQXFZ+v0y3fnRyw9EkUk+k8p0RHVyrPxMp TTsw== 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:message-id:date :subject:to:from:sender:dkim-signature; bh=egIorAOh8Fc5T7+gzvdAAAGcUIWhOc2VExPcdyf6XvY=; fh=xTZjWs83fiYu63Vh7K4ZYi6ubjTxyCJp5eJ9uL1z4VU=; b=Z4tiTkxM9yRZKhxF/2sy/cGY45UJRt9nJQrzduAZDxqHAJ7Mb9uJ9rnlWNmA25XZ7h ozfSFPFOM1yw58RMzdymJRchUMOWv5RNnR+Xbdl1YvBunU5d0++wePdb+yiY95UeWCbj N5sIasWOR5BtH6GyHZdSs5Zd525CjVnPNUDPa/SgaZSC2+7hIXuACDmW39slAERBj3XF hpkaCYn0vDkIA7MdbJ5Efhs4dxqKn3LQhuHf81Jrc3sD9CKdjd0vQvkB4yCC7QRQoLM0 KblzwLHFUAchyHDO2s20iIwaZV6AP2YBLJTLMFOwcw3iU/1uqhJV0JysolrPqqtPtlzH fcUQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1765281016; x=1765885816; 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:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=egIorAOh8Fc5T7+gzvdAAAGcUIWhOc2VExPcdyf6XvY=; b=EmdnwbkHp9Ev9MJohVi/4FIEtQmrK/5gC/4RiJExn16+oIDKdbXUpR9VmElA6jCBb6 jBUlMxAFhMzd1F1iPHWl6k4MWcHT2VIWgwQDPQ2DDeYbw+Wu5NRgDqXISTvIHx0nh7rX g4u27Fl4tbRRNXHv3NDsPcjAHb1hykg98ui2NPHVsrkaMJFqw+9dzTLGUCS8b5z+KwzU AEfsh9oAgGSrdSaTqR/KNR1LI+r+6CBijAO72Xtm6EDwJddl4k7UDH1uhuUJgarERtj4 PWcyVL4pZPE25kCG/ojd86/m5ajaxMstYcwEv41FfFXpFDbF8dHcXuh0p+ullkJPVVqM O3Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765281016; x=1765885816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=egIorAOh8Fc5T7+gzvdAAAGcUIWhOc2VExPcdyf6XvY=; b=thXVTx+V+dBo67uGYWmwyRGfvvdVdjZkEfri/VpmvwBr/+DByd7q/EfM5RU/XdIjwH qA+N36eR+796CKWhzNca/M6sC2af85f7eCJHEAt1mPzJ4YG7JBER6Nf33Y4/wgeIAxfy s/WpogJbPCFnt26G4L4CZ8OgzaaftFBCiYTkj1myy7HueNDMu9LAC0PhNH8nOS5Ah3LX nXYdpNlLYtgdiqWvqZUJkI3jlCX59vyKv5eejroepl3Pbykscd3VU28A8uFDbmM7pR4d EkCGSiOxJx1ZG0TEvY+VI6DHk3bBz8ctbhIK8X+XayfhxkkVazGU0carjI1dUod6+03a Q7QA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCW/R3xjrTCVets0JXnkl3RmaLDYV3f5Im9sQDzwvJ1++bTtcPwEt8dFwXmoja/uVMGrR4vvuZ4=@isar-build.org X-Gm-Message-State: AOJu0YyK+bA2CKKq0L1dNrjBO0BsJ+0hgc7XLAunW0KnwyO1vDmGhKut 0aP6s9ZfS8gJDiIHWtaPOGz7te4PZ4jiHuLrDYO6WTCE51fMwgxUWSkD X-Google-Smtp-Source: AGHT+IEX7vfxCjDVMkGNGnX99d6XSHMWDRvtyz6jICNelJ0zmChmbtjBez7zU5QBhOlR4yHO197zVg== X-Received: by 2002:a05:651c:3135:b0:37b:970f:d33b with SMTP id 38308e7fff4ca-37ed1ffe3cfmr33371521fa.3.1765281016078; Tue, 09 Dec 2025 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AWVwgWZ+5looKNI5AK+PT3zrnBOGRXVvCePo/Qdyn+ykyigDqQ==" Received: by 2002:a2e:9d86:0:b0:37b:9692:7e83 with SMTP id 38308e7fff4ca-37e6e932effls9683381fa.0.-pod-prod-06-eu; Tue, 09 Dec 2025 03:50:13 -0800 (PST) X-Received: by 2002:a05:6512:230a:b0:594:346f:4850 with SMTP id 2adb3069b0e04-598853c55bamr3869736e87.49.1765281013085; Tue, 09 Dec 2025 03:50:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765281013; cv=none; d=google.com; s=arc-20240605; b=a6wZSVrPPlXEdsooHQi6P4EL+87DHzyRlbSUt7hTFvxVso352JKL9dbPDabJZ2R/r8 oHR0zCiNQE4EwICU6DtoX709vLXj7NL/0ss/Zvm5QNp2yBnSHhOap85WHQCpvipnZ8B1 NVjoQ8XBN4hIr9TXW4Y2s7JtNoZD4ag7t6gYbGEGBl4FL9CpANecZnT0zQFEpHRYrBqe bJUufv+d5RQ8uu3ceB8AdkBAbzZqEqt+3R8nK/g8i32ACb0Q1WEga+1JrxRYdBJxMLj9 99vfdFCgnclgnW79ziVDZ5glSGkMiP+bgcUYjGgcuIp8hBvuYPfK2Bt86cnRh5j/ocdk 8GGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=/FyJj4uttKbFDVUhXsMww4lTIfbl7jE4naXLbmqJi8c=; fh=/xsTjs+6l2x1Fj3Fu/DhTJgwF7wTz+bXesmr8cmD8zc=; b=UOJVL9/XRdXIfm0K8xZdDDV7jg0+L76pQkuX0kweistx21TvUbOAi6IGOomPYZ6xcG Hpap8h3l/9g8JzHs/PKF8CiSzeodZE5o+TrawD6/T3hZAlrIWDzTFLS17H73+6e2yySA 3+549tGFqcR+o6wKRmDxZZSpr4I5KQ+rVUrTs4TuBxcESelcD0dw6lfpRu3sQzq1OqKq emc/ziIJW8p/qQeAYBDEPp8/YeULBaQEFQVGxAiP4hJrg5QcB5XZwv0LyCGEFSEuQ7ND PYliz1iNQ0xRNHqKmPh1JPKJ8mD5T2yBVfAQXWdK6dIBznpKlJ8yXehJnnqCsFCyoLTX 1uDA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-597d7be9834si307561e87.6.2025.12.09.03.50.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Dec 2025 03:50:12 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 5B9BoBbm002153; Tue, 9 Dec 2025 12:50:11 +0100 From: Zhihang Wei To: isar-users@googlegroups.com, wzh@ilbers.de, quirin.gylstorff@siemens.com, jan.kiszka@siemens.com, cedric.hombourger@siemens.com, christoph.steiger@siemens.com Subject: [PATCH] initramfs: Restore default "generate-initrd" logic in initramfs.bbclass Date: Tue, 9 Dec 2025 12:50:09 +0100 Message-Id: <20251209115009.1932908-1-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 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-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= After 78d42de "rootfs: rework no-generate-initrd rootfs feature", the logic for adding "generate-initrd" feature was moved from image.bbclass to rootfs.bbclass. This feature controls whether the initrd(initramfs) is generated and deployed under build/tmp/deploy/images/. By default, this feature is not added. However, initramfs.bbclass also inherits rootfs.bbclass. As a result, builds of initramfs recipes, such as isar-initramfs.bb, no longer generate or deploy an initrd image. The test case test_var_image_initrd has failed. This patch adds "generate-initrd" feature back to initramfs.bbclass, and cleans up incorrect conflict resolving in c3c4e72. Signed-off-by: Zhihang Wei --- meta/classes-recipe/image.bbclass | 3 +++ meta/classes-recipe/initramfs.bbclass | 1 + meta/classes-recipe/rootfs.bbclass | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 24a23808..2c8beefa 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -48,6 +48,9 @@ python() { d.setVar('INITRD_DEPLOY_FILE', initrd_image) } +# Generate and deploy debian default initrd if no custom initrd needs to be built +ROOTFS_FEATURES += "${@ 'generate-initrd' if (d.getVar('INITRD_IMAGE') == '' and d.getVar('IMAGE_INITRD') == '') else ''}" + # This variable is used by wic and start_vm KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" diff --git a/meta/classes-recipe/initramfs.bbclass b/meta/classes-recipe/initramfs.bbclass index 85b07f28..7d4ae523 100644 --- a/meta/classes-recipe/initramfs.bbclass +++ b/meta/classes-recipe/initramfs.bbclass @@ -27,6 +27,7 @@ DEPENDS += "${INITRAMFS_INSTALL}" ROOTFSDIR = "${INITRAMFS_ROOTFS}" ROOTFS_FEATURES = "generate-manifest" +ROOTFS_FEATURES += "generate-initrd" ROOTFS_PACKAGES = "${INITRAMFS_GENERATOR_PKG} ${INITRAMFS_PREINSTALL} ${INITRAMFS_INSTALL}" # validate whether there are incompatible packages in the installation list diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index eb5645af..cbb658dd 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -23,8 +23,6 @@ ROOTFS_INITRAMFS_GENERATOR_CMD = "${@ d.getVar('ROOTFS_INITRAMFS_GENERATOR_CMDLI ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "${@ initramfs_generator_cmdline(d)}" ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}" -IMAGE_INITRD ?= "" - # Features of the rootfs creation: # available features are: # 'clean-package-cache' - delete package cache from rootfs @@ -32,8 +30,6 @@ IMAGE_INITRD ?= "" # 'export-dpkg-status' - exports /var/lib/dpkg/status file to ${ROOTFS_DPKGSTATUS_DEPLOY_DIR} # 'clean-log-files' - delete log files that are not owned by packages # 'populate-systemd-preset' - enable systemd units according to systemd presets -# 'generate-initrd' - generate debian default initrd -ROOTFS_FEATURES += "${@ 'generate-initrd' if d.getVar('IMAGE_INITRD') == '' else ''}" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"