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, 10 Apr 2025 07:28:04 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53A5S3SH009415 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 07:28:03 +0200 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-43e9a3d2977sf3572585e9.1 for ; Wed, 09 Apr 2025 22:28:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744262878; cv=pass; d=google.com; s=arc-20240605; b=JFnaMR011JoAT3BothRZArxPOFTx2Ne5mArS/U79cXKdwdibxjr0mR53YPg0bPju3J FFTU5shaV6tbGMKS+iuosjk6xMrHDHS9axlbxAekgdGN9eE8K7IOVGSVRZaT8400ACL6 uU3K8bTbvNu4NTbMJxLj/CFATwGRzgzXYDM50BxO/KuR7c83AH1uiIZLW73inRtFxyiC k14Uk5rpmLGsC3vdtsdFB9OSuFRTgvLr63oFXke8hpbs5ICmM3C2iUorIauwB58ZQq16 3Tzd8ajAJiAQNh7tOqCTMachXWZ9em4CLn6gzuAuddWiePB79///qN+201vpyNtrz1yn fXow== 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=Y+QEZMOYJEkMkZ1bRgZaRA9wWSinrPGYNSBj6V0ysog=; fh=PoGmMZqfSzq3CDQnOoui2hwX6YVCDNGkkHVBMRImjTU=; b=A3+C3tSYecwCU8xgPtJ5hvxcc5B8oyxrZoFXo7Ocf4OBP/5uqVjG3SCF+OXgCNjkGr nLqp2tu/LlvLa9crEKRoSzoXE2OV9PaxaXgaTdSpEKU6h+5JiBY7xe3n1I+ttvjPwar5 W3ZcyhqEkgp3s3cxhYjHGEHBrGzXbjohAHsiIDzBL7cTyUjJU2Hl4vbWK42/9uecFYk1 VpYWceML5FiR/GO85uOALp7nGZn2YO4cJjoKuo9diVUmmE0mgi7cVTiqMxw9ZPAmrQbI aq8/3NVCSNgxi36Lpl8wUvrdpMU4TA+ybSXC8JajsZszbY6bubY91OJ4x3ydR190J45v kGLg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=fAZdyhnl; spf=pass (google.com: domain of fm-1321639-20250410052754348f8329b973459864-i5rhmq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250410052754348f8329b973459864-I5rhmq@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=1744262878; x=1744867678; darn=ilbers.de; 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=Y+QEZMOYJEkMkZ1bRgZaRA9wWSinrPGYNSBj6V0ysog=; b=iLkjRTc9F+i8foqYirZDt/7Y0Q4RV7811sAzSb2Ua/RiGEoTg1wAWqZ/SXjDLUjBNo ZxD8qkGLtz0NQETVdlyU3wvju/kU84w5AQmiM1Z4NOlWa4eZCVjxu/OQ5jjxuvHZazlw Egba54ZL9db+k1PTz5r8XopjDMy7Dp5zMHxNc9pE+6Me0zF0R8vw7UunaVAmaMFYYnYP U6ac7m/YJUVGZ6DHKO7vAFAjdhKQixGSWGLTUTvcqnUYkHXClMH8wpN+ZpQAY8oPfHoF 7XTwqZAq/eu1WWuKikgWETgqzoMkq3kZXZFK9wKXidRZFb+p1+iOkiNn2dA++SsCq/Fc zf9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744262878; x=1744867678; 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=Y+QEZMOYJEkMkZ1bRgZaRA9wWSinrPGYNSBj6V0ysog=; b=IaF3dBs/1PvKKs5veNx+Q6vDcpE9bp16Kx67+qI1oo8I1Aib17MR72fOScrIhkdIZw QvkHequPMcaFFe29cWu+f8QN1vnSRDD3RQVA9H97nUTaGrpJaZzjSbfb9CX/KUDrbjP8 I/UKkDIbGOF+qxbqukX+56iOn2vAZqelwScDNwYd4Xf+7t6851S+mitZHu4BwtZSjm1F GusMLmT6Y6rR7XphJ0AXnK2BpkjlxKm3EX6fvkmptvn7/OiRQrMvKBFSFLywjAFOoAwv 4midLlMe4SVyG0TYBqfAcT+gKGxN1O67E7gK6WTM8U+OXWMALZagucAMRl48if7Jfk1u khTQ== X-Forwarded-Encrypted: i=2; AJvYcCXl3pBXVsOSY0YU4E+1Vmko0tIEgfhkc8znxlyIBKI2tj1k6+rjy7DSIH2mKOCd0BgwVPP0@ilbers.de X-Gm-Message-State: AOJu0YxSjQBkZxwCyjAlHZmSLsP35KmUsKU0OoqcoGeduCO5wJVBlblC hwwvZJoEJrI7MwMInw7h+IaepmcnnEhiuaSTHEJAJEurUYloaYev X-Google-Smtp-Source: AGHT+IE085N5edLD+BrEIyGjhDhRJ2I4ov35t31rUTU7tKVl9/6Mh0iWEdjKIaZq9RsuhIyvfldKaA== X-Received: by 2002:a05:600c:348a:b0:43c:fdbe:4398 with SMTP id 5b1f17b1804b1-43f2fdceccfmr8243045e9.6.1744262877744; Wed, 09 Apr 2025 22:27:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAKkmGqc/43bj4iCUBNGek0ujvHNVHsqBowO0+vthk1vRQ== Received: by 2002:a05:600c:1e19:b0:43c:eb7b:1403 with SMTP id 5b1f17b1804b1-43f2c571b23ls3446125e9.1.-pod-prod-09-eu; Wed, 09 Apr 2025 22:27:55 -0700 (PDT) X-Received: by 2002:a05:6000:18a5:b0:39a:c9ed:8657 with SMTP id ffacd0b85a97d-39d8fd72838mr631544f8f.17.1744262874920; Wed, 09 Apr 2025 22:27:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744262874; cv=none; d=google.com; s=arc-20240605; b=Gmaverof7gb4CdAMzukM4HMfnPmDhSF69tlL0PYVju9r4ICj8KKFI0IEOkBsRzaEVj SsHlMdf3oIi7wR5xfqDYaBjLYc/oP5yXhsgSPBuTpoglK2lhmhituuvxYAHbtqv22z1z mThERwTZu+L4+9budBoBQFMPJCh5BE52ZPbe5aNt5zqm5Rt6OZChlt0UCubEriMYzhNT U+SEwvguQDlntNuoKl0VNb4oSAZTrgLLG39+7gbqQp56V2ADUGlJNFxVsK5qda1HPkW0 /3lEEe6vMqj7nUje+Yhf71dBz3wgMwJYX5QGsjIOMJP7jX75ofMO34jEuCYOzAJu5S+O i/5Q== 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=LyBw2t3c8aMFo5JKLihLjBSJvkOxmyvoBLO+SEVIfvs=; fh=ihiGjvo7NUvpz5Iu2nNH4iKRnWbkT1eQ96FbYrmsmqY=; b=Gu7Q9AtaXIt0W5dwuQRnQ++Io6nPbxDPa4aIAlYRbXchJWLKrNicisTrELegvKDbw1 wKZxTLXG6ENVHMuVpDh6wShInjNRWBTuyQFu6it+tuBTY34i/CQBHhlbbUSzGbYG7ssb h1TvVencmUgeyTW6cgVXRVgjY9CrSInfMTexIsv06Up5Jc8ve+xWCMFqC0eEHMrP0/OG XbQWEeZKny/PCy7WklmePHIOweO7VF9mTVgM/gXrHzsQpG+hGxxgDTYKEhk3rPNsTh87 +8JVTuWsUfLGWDqWsdRMA2Z++4znJSE/rarxLFpSb+LMy8nHjkveoZD0L48ir5S43ru5 kAeQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=fAZdyhnl; spf=pass (google.com: domain of fm-1321639-20250410052754348f8329b973459864-i5rhmq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250410052754348f8329b973459864-I5rhmq@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 5b1f17b1804b1-43f231320e9si503725e9.0.2025.04.09.22.27.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Apr 2025 22:27:54 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1321639-20250410052754348f8329b973459864-i5rhmq@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 20250410052754348f8329b973459864 for ; Thu, 10 Apr 2025 07:27:54 +0200 From: "'Felix Moessbauer' via isar-users" To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, cedric.hombourger@siemens.com, Felix Moessbauer Subject: [PATCH 1/2] delay creation of initrd until end of rootfs install Date: Thu, 10 Apr 2025 07:27:50 +0200 Message-Id: <20250410052751.3835154-2-felix.moessbauer@siemens.com> In-Reply-To: <20250410052751.3835154-1-felix.moessbauer@siemens.com> References: <20250410052751.3835154-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=fAZdyhnl; spf=pass (google.com: domain of fm-1321639-20250410052754348f8329b973459864-i5rhmq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250410052754348f8329b973459864-I5rhmq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Content-Type: text/plain; charset="UTF-8" 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-TUID: hOtE1xsoe/lg This patch solves major performance issues around the initramfs creation by ensuring that the initrd is only created once. This is implemented by stubbing the update-initramfs call during the package installing. After all apt operations are completed, we manually trigger the initrd creation. In case a custom initramfs is used, the creation is completely skipped in the image rootfs, as this would anyways not be used. We further unify the initrd generation in the rootfs and in the initramfs class. Before that, each package install that made a initrd relevant change triggered the update of the initrd. As we have multiple apt calls during the build, this step was sometimes executed multiple times. In addition, the apt install step is emulated, further slowing down the initrd generation. On a test build of the RPi4b target with a detached initramfs and a distro kernel, this patch set reduced the build time form ~50min to ~15min. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 17 ++--- meta/classes/initramfs.bbclass | 39 +---------- meta/classes/rootfs.bbclass | 66 ++++++++++++++++++- .../sbuild-chroot/sbuild-chroot.inc | 1 + 4 files changed, 72 insertions(+), 51 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ff3cd737..8523a662 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -67,6 +67,8 @@ inherit essential ROOTFSDIR = "${IMAGE_ROOTFS}" ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-log-files clean-debconf-cache" +# when using a custom initrd, do not generate one as part of the image rootfs +ROOTFS_FEATURES += "${@ '' if d.getVar('INITRD_IMAGE') == '' else 'no-generate-initrd'}" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -341,17 +343,6 @@ do_copy_boot_files() { sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi - if [ -z "${INITRD_IMAGE}" ]; then - # deploy default initrd if no custom one is build - initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" - if [ ! -f "$initrd" ]; then - initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" - fi - if [ -f "$initrd" ]; then - cp -f "$initrd" '${DEPLOYDIR}/${INITRD_DEPLOY_FILE}' - fi - fi - for file in ${DTB_FILES}; do dtb="$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ -iwholename '*linux-image-*/'${file} | head -1)" @@ -450,7 +441,7 @@ EOSUDO -exec touch '{}' -h -d@${SOURCE_DATE_EPOCH} ';' } do_rootfs_finalize[network] = "${TASK_USE_SUDO}" -addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess +addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess do_generate_initramfs ROOTFS_QA_FIND_ARGS ?= "" @@ -461,6 +452,8 @@ do_rootfs_quality_check() { args="${ROOTFS_QA_FIND_ARGS}" # rootfs_finalize chroot-setup.sh args="${args} ! -path ${ROOTFSDIR}/var/lib/dpkg/diversions" + # initramfs is generated outside of the image rootfs + args="${args} ! -path ${ROOTFSDIR}/boot/initrd.img*" for cmd in ${ROOTFS_POSTPROCESS_COMMAND}; do case "${cmd}" in image_postprocess_mark) diff --git a/meta/classes/initramfs.bbclass b/meta/classes/initramfs.bbclass index 0197a60b..3a996f78 100644 --- a/meta/classes/initramfs.bbclass +++ b/meta/classes/initramfs.bbclass @@ -6,14 +6,11 @@ DEPLOYDIR = "${WORKDIR}/deploy" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" -# Sstate also needs to be machine-specific -SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" -SSTATETASKS += "do_generate_initramfs" - INITRAMFS_INSTALL ?= "" INITRAMFS_PREINSTALL ?= "" INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs" INITRAMFS_IMAGE_NAME = "${INITRAMFS_FULLNAME}.initrd.img" +INITRD_DEPLOY_FILE = "${INITRAMFS_IMAGE_NAME}" # Install proper kernel INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" @@ -28,37 +25,3 @@ ROOTFS_FEATURES = "" ROOTFS_PACKAGES = "initramfs-tools ${INITRAMFS_PREINSTALL} ${INITRAMFS_INSTALL}" inherit rootfs - -do_generate_initramfs[network] = "${TASK_USE_SUDO}" -do_generate_initramfs[cleandirs] += "${DEPLOYDIR}" -do_generate_initramfs[sstate-inputdirs] = "${DEPLOYDIR}" -do_generate_initramfs[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" -do_generate_initramfs() { - rootfs_do_mounts - - trap 'exit 1' INT HUP QUIT TERM ALRM USR1 - trap 'rootfs_do_umounts' EXIT - - rootfs_do_qemu - - sudo -E chroot "${INITRAMFS_ROOTFS}" sh -c '\ - export kernel_version=$(basename /boot/vmlinu[xz]* | cut -d'-' -f2-); \ - if [ -n "$kernel_version" ]; then \ - update-initramfs -u -v -k "$kernel_version"; \ - else \ - update-initramfs -u -v ; \ - fi' - - rootfs_do_umounts - - if [ ! -e "${INITRAMFS_ROOTFS}/initrd.img" ]; then - bberror "No initramfs was found after generation!" - fi - cp ${INITRAMFS_ROOTFS}/initrd.img ${DEPLOYDIR}/${INITRAMFS_IMAGE_NAME} -} -addtask generate_initramfs after do_rootfs before do_build - -python do_generate_initramfs_setscene () { - sstate_setscene(d) -} -addtask do_generate_initramfs_setscene diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 446d92d6..d49cd1ef 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -14,6 +14,7 @@ ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}" # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} # '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 +# 'no-generate-initrd' - do not generate debian default initrd ROOTFS_FEATURES ?= "" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -22,6 +23,9 @@ ROOTFS_CLEAN_FILES="/etc/hostname /etc/resolv.conf" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +# path to deploy stubbed versions of initrd update scripts during do_rootfs_install +ROOTFS_STUBS_DIR = "/usr/local/isar-sbin" + # Useful environment variables: export E = "${@ isar_export_proxies(d)}" export DEBIAN_FRONTEND = "noninteractive" @@ -165,6 +169,13 @@ rootfs_configure_apt() { EOSUDO } +ROOTFS_CONFIGURE_COMMAND += "rootfs_disable_initrd_generation" +rootfs_disable_initrd_generation[weight] = "1" +rootfs_disable_initrd_generation() { + # fully disable initrd generation + sudo mkdir -p "${ROOTFSDIR}${ROOTFS_STUBS_DIR}" + sudo cp -a ${ROOTFSDIR}/usr/bin/true ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/update-initramfs +} ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" @@ -227,7 +238,21 @@ 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} ${ROOTFS_PACKAGES} + /usr/bin/apt-get ${ROOTFS_APT_ARGS} \ + -o DPkg::Path='${ROOTFS_STUBS_DIR}:/usr/sbin:/usr/bin:/sbin:/bin' \ + ${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}" +} + +ROOTFS_INSTALL_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'no-generate-initrd', 'rootfs_clear_initrd_symlinks', '', d)}" +rootfs_clear_initrd_symlinks() { + sudo rm -f ${ROOTFSDIR}/initrd.img + sudo rm -f ${ROOTFSDIR}/initrd.img.old } do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" @@ -421,6 +446,45 @@ python do_rootfs_postprocess() { } addtask rootfs_postprocess before do_rootfs after do_unpack +SSTATETASKS += "do_generate_initramfs" +do_generate_initramfs[network] = "${TASK_USE_SUDO}" +do_generate_initramfs[cleandirs] += "${DEPLOYDIR}" +do_generate_initramfs[sstate-inputdirs] = "${DEPLOYDIR}" +do_generate_initramfs[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" +python do_generate_initramfs() { + bb.build.exec_func('rootfs_do_mounts', d) + bb.build.exec_func('rootfs_do_qemu', d) + try: + bb.build.exec_func('rootfs_generate_initramfs', d) + finally: + bb.build.exec_func('rootfs_do_umounts', d) +} + +python do_generate_initramfs_setscene () { + sstate_setscene(d) +} + +rootfs_generate_initramfs[progress] = "custom:rootfs_progress.InitrdProgressHandler" +rootfs_generate_initramfs() { + if [ -n "$(sudo find '${ROOTFSDIR}/boot' -type f -name 'vmlinu[xz]*')" ]; then + sudo -E chroot "${ROOTFSDIR}" sh -c '\ + export kernel_version=$(basename /boot/vmlinu[xz]* | cut -d'-' -f2-); \ + echo "Generating initrd"; \ + update-initramfs -u -v -k "$kernel_version";' + if [ -n "${INITRD_DEPLOY_FILE}" ]; then + cp ${ROOTFSDIR}/initrd.img ${DEPLOYDIR}/${INITRD_DEPLOY_FILE} + fi + else + echo "no kernel in this rootfs, do not generate initrd" + fi +} + +python() { + if 'no-generate-initrd' not in d.getVar('ROOTFS_FEATURES', True).split(): + bb.build.addtask('do_generate_initramfs', 'do_rootfs', 'do_rootfs_postprocess', d) + bb.build.addtask('do_generate_initramfs_setscene', None, None, d) +} + python do_rootfs() { """Virtual task""" pass diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 6478d3a6..98e427e5 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -55,6 +55,7 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" +ROOTFS_FEATURES += "no-generate-initrd" ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" -- 2.39.5 -- 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/20250410052751.3835154-2-felix.moessbauer%40siemens.com.