[1/4] rootfs: Implement update-initramfs stubs via symlink

Message ID d12f94da01822c39f405950cb4390f8e39123e09.1757930833.git.jan.kiszka@siemens.com
State New
Headers show
Series Several micro-optimizations | expand

Commit Message

Jan Kiszka Sept. 15, 2025, 10:07 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

Avoid needless copying of any files. Consolidate the sudo calls into one
at this chance.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/rootfs.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

MOESSBAUER, Felix Sept. 15, 2025, 10:32 a.m. UTC | #1
On Mon, 2025-09-15 at 12:07 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Avoid needless copying of any files. Consolidate the sudo calls into one
> at this chance.

Thanks!

Acked-by: Felix Moessbauer <felix.moessbauer@siemens.com>

> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
> index 7b7859b9..d91fecb0 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -182,8 +182,12 @@ 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
> +    sudo -s <<'EOSUDO'
> +    set -e
> +
> +    mkdir -p "${ROOTFSDIR}${ROOTFS_STUBS_DIR}"
> +    ln -s /usr/bin/true ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/update-initramfs
> +EOSUDO
>  }
>  
>  ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update"
> -- 
> 2.51.0

Patch

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 7b7859b9..d91fecb0 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -182,8 +182,12 @@  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
+    sudo -s <<'EOSUDO'
+    set -e
+
+    mkdir -p "${ROOTFSDIR}${ROOTFS_STUBS_DIR}"
+    ln -s /usr/bin/true ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/update-initramfs
+EOSUDO
 }
 
 ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update"