From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 Dec 2025 11:03:06 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f58.google.com (mail-wr1-f58.google.com [209.85.221.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5BBA2u3Q018311 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 11 Dec 2025 11:03:06 +0100 Received: by mail-wr1-f58.google.com with SMTP id ffacd0b85a97d-42f9f4da5a5sf365952f8f.0 for ; Thu, 11 Dec 2025 02:02:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1765447371; cv=pass; d=google.com; s=arc-20240605; b=WwTSDrbcgXWdrRmH09EqiT7atbSJs0r9vmE38lv6DHi+9sGMA6xhdIgHyBvki1tbGJ NhsSxFojOo1ie4DYLZc2Y9ORkNc0BdJXfblqrYKNn8thdEbZzW5u3O9wdifw5znY8rpk ZSEOhouC0V1O27+8FlkaGUR/FBZ4vpajoCjpSi/IhBpxxz3HrBQWpFXoSUbwrcZzbNXT Jbdlqc5XcEI8u27j9OAzdVfwSHCTFKIhYJkqplebLVZPUZApTH0owFJ05tR5JqexVGY2 ICvt2HxSjvKVXqyxCc2Z0n6jzXiriQVwdAwaGwE43fu0eJfY/Jb2k8s3d1b1H7WDeHmL NLtQ== 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:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :sender:dkim-signature; bh=kYd8YY+Wvo/SbjX82E3kbPeQwqccI5ppNCn9/UyJzsY=; fh=hZWHX2dEirClA3qEmGKu4lNHZEIdJ8Yl6FIUmlEvbM0=; b=ZfPBAbUpya4n81xYiq96KNra1d3IAa4e0kmG7QjpRCZt3M6jJGNZfzJ7XkGjMT9UA0 SQMMG8OLZd9vhhsD42eoEzMPtVzPfBQ4FtaVbayoppWq/UY/FCtchW89YohtvYQ7os3y t77ySrYIL4E7yz2t3m4Ixjsz4alkymWqYpaa4lw5aopdqzDJNpgDjpWXCAu/7HMKZx65 x5n87hDIAEU7gjTJTmO9e72Kel1md9dBusTZ/ODNtoMzHR6pUCb5DV/bh3v2+mByYbbn b0jvoVIphK5tOsKxIbsdzsz4hiSWDkkPCkfspfpxiAcKNAdNZABFG0zUj8BSnhQo4FCK 4UkA==; darn=ilbers.de 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=1765447371; x=1766052171; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:in-reply-to:from:content-language:references:to :subject:user-agent:mime-version:date:message-id:sender:from:to:cc :subject:date:message-id:reply-to; bh=kYd8YY+Wvo/SbjX82E3kbPeQwqccI5ppNCn9/UyJzsY=; b=dvx19zKAPoloRQD3CCYQ5vqlQcOOTCmtRSeBMGi4Sm2jTcwzd0Cwg1D2dJ+lFz+Ifr 7+FDTVSouF9pzAicgEEDGIzSo6L9goY5pOVS6qFQHhJ+P3Kit07BVWManrYIWqRfrqMY /SqqjGFQlr75PMASzibGCJcpul5F9ZX7RCihHIfYyX5TBHbHvoy2JRcHRHgir8yl1JbI 6hVcdpcohM6XBuZbTRygUYnTN6Xh5vELshyscOR4e620SEh3lN/Kbur8cxmkoxPS+yr2 Jzx6k7B4tqY7T6Arki1KVvBxqMPqZ5y93g1QvrlVdSmnsDSRXQHRJ/b6GMGZ39antjKw 9unQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765447371; x=1766052171; 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:in-reply-to :from:content-language:references:to:subject:user-agent:mime-version :date:message-id:x-beenthere:x-gm-message-state:sender:from:to:cc :subject:date:message-id:reply-to; bh=kYd8YY+Wvo/SbjX82E3kbPeQwqccI5ppNCn9/UyJzsY=; b=qdAadoooF1wcQAbDo6apEUsgNRF0f3wxY2fZiQZ6Olfcw96UznjaVe4I02QFf/dZ5r CJIYCyfFicdUCxCBIv9NwhfxPblA+NWk/SmsVgjg7irW7y95DKx7fhGcPul7f43AhyDv IBm/pTteWljVo3qOvOJO908kWTXUPR0nERsr1Ww51foLH9vKYlJ+aAqc10bci+09rN68 DaMaFAE+ap6ngK68kO87vYGB6M//TCGMcxJL02TSLreOxXJfDCX4fkUhnLV8O9gIRKrO mGH1kB3HfSeilfeNED7QHuB137Bhj9Qsdy6rHovTJlNL5dvESGMuTBr/+wwJiECWmUOo uQVQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWIwFuvYrKO/lobJ0WYhVm5v1PiZiB4YqYTws/k4aMB0Fm9c0T+FmMTL0jULbWJvq41DI1f@ilbers.de X-Gm-Message-State: AOJu0Yy8Zufh54H5EYR/nKF3496YDnXAcb438RuB7bNEfEd6NnLzoubT UsWtms1sQbk4O5ZNA+J+okAZMbCY3Vp4+kicJ8Rs2sJ/YaIq+IlY9T1U X-Google-Smtp-Source: AGHT+IHvmkWgtj6enggO7ndpWY01zuHZMA2nQeztQhU/qqdp+O7PhmaOwbZc1lrcEXz0wnOIwW53rw== X-Received: by 2002:a05:6000:26cd:b0:429:cd3f:f45f with SMTP id ffacd0b85a97d-42fa39cc91dmr5418195f8f.7.1765447370296; Thu, 11 Dec 2025 02:02:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AWVwgWYUGV3qtVQ/suayFqmMoBbIjNcgjCKMXh0OLjR1Xd877Q==" Received: by 2002:a05:6000:2405:b0:424:21d6:1fad with SMTP id ffacd0b85a97d-42fa8b98f40ls363164f8f.1.-pod-prod-07-eu; Thu, 11 Dec 2025 02:02:47 -0800 (PST) X-Received: by 2002:a05:6000:22c4:b0:42b:2dfd:5350 with SMTP id ffacd0b85a97d-42fa3b12b96mr6286796f8f.56.1765447367289; Thu, 11 Dec 2025 02:02:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765447367; cv=none; d=google.com; s=arc-20240605; b=dn1quXVXu8aIhT7y2EnwcuOp1xKFwodWcN0LxeEJQKpKFoesmp7HmrmrzZIcDPWycJ y0vUHpqPv+f9FIBnI5g/fKpEcT6wLjXaAF8r2fqAD6/NSrtudM0RYhioH12s8tl+SpFP feYOkpmeqnfr9/OSyS8kCB2a8uetkZdssRsEQR/TdHBirUJzAlIobTkJNgqKVlKdKchX bnH9FkRa5zlQYIOA1XwuphyjzlrL/7CvuyNgmStrfr5xcqaH7HZE0HLLxKrUDKevx9xk bhl4BX4SUjnWTpmMtJ5F9LxuJtL0SYNbwmldBkkm2c7GxfBb+Po4aFr8PjDbXgIaAnSu Am0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id; bh=5mGTE6ln8wPEq1kGUCwCSaZBMjjxQD61v3XmrWvjMBA=; fh=slqST1hmBec75NY7xSjNDedKGK3IWHmnpynWI1cZg/U=; b=HJxUQONJQl7CsGOIbUigioDA294tw3O+T4IK/lKDFxOxvg1DDymkvPChquaO/0hdwJ Cf4h9EbGYnnPVmhQBpbXmXkX1vaPcmZQllEF4DW9VieaZw/aWDF+LPMac3L7OXp1imrk JfGspXpm8M3mLBeUi5pRoz+uTMv5vVjn0OgDFNitHqY8JLD892MaH2ysUZtcKyYDVTE6 7+jOX8klmMpTr1gVRmWtuF9UXEaX7WwJXzHHgr2AJ6QFTTiLAE8MV5FHtAtasLinzW0D 3AaCwVternWHuHsku1LkZbeWBd+AcEMXkPy1S7M2d+S//IU8pgMGuAOip8OIgauChGvD 6sog==; 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 ffacd0b85a97d-42fa8a71709si52277f8f.5.2025.12.11.02.02.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Dec 2025 02:02:47 -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 [192.168.178.24] (dslb-090-186-034-039.090.186.pools.vodafone-ip.de [90.186.34.39]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 5BBA2XsQ018299 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Dec 2025 11:02:33 +0100 Message-ID: Date: Thu, 11 Dec 2025 11:02:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] initramfs: Restore default "generate-initrd" logic in initramfs.bbclass To: isar-users@googlegroups.com, quirin.gylstorff@siemens.com, jan.kiszka@siemens.com, cedric.hombourger@siemens.com, christoph.steiger@siemens.com References: <20251209115009.1932908-1-wzh@ilbers.de> Content-Language: en-US From: Zhihang Wei In-Reply-To: <20251209115009.1932908-1-wzh@ilbers.de> Content-Type: text/plain; charset="UTF-8"; format=flowed 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-TUID: QMCAgJ8n91pr Applied to next. Zhihang On 12/9/25 12:50, Zhihang Wei wrote: > 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" > -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/bef8a9db-a8ed-4f6b-9ed1-9a1c9441592d%40ilbers.de.