[PATCH 0/4] Several micro-optimizations

[PATCH 0/4] Several micro-optimizations

['Jan Kiszka' via isar-users]

See patches for details.

Jan

Jan Kiszka (4):
  rootfs: Implement update-initramfs stubs via symlink
  sbuild-chroot: Skip initramfs generation while installing build
    dependencies
  rootfs: Avoid unneeded commands inside chroot
  image-locales-extension: Optimize package removal

 meta/classes/image-locales-extension.bbclass  |  3 +-
 meta/classes/rootfs.bbclass                   | 33 +++++++++++++------
 .../sbuild-chroot/sbuild-chroot.inc           |  2 ++
 3 files changed, 26 insertions(+), 12 deletions(-)

-- 
2.51.0

-- 
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/cover.1757930833.git.jan.kiszka%40siemens.com.

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

['Jan Kiszka' via isar-users]

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(-)

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

-- 
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/d12f94da01822c39f405950cb4390f8e39123e09.1757930833.git.jan.kiszka%40siemens.com.

[PATCH 2/4] sbuild-chroot: Skip initramfs generation while installing build dependencies

['Jan Kiszka' via isar-users]

From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 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
-- 
2.51.0

-- 
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/88ca507a0d71bcd597761b24f1862c9dc01b6cd1.1757930833.git.jan.kiszka%40siemens.com.

[PATCH 3/4] rootfs: Avoid unneeded commands inside chroot

['Jan Kiszka' via isar-users]

From: Jan Kiszka <jan.kiszka@siemens.com>

As the chroot implies emulation in case of cross-installation, any call
into it that can be avoided saves a few seconds.

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

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index de8077e6..f02397b8 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -245,8 +245,11 @@ rootfs_export_package_cache() {
 ROOTFS_INSTALL_COMMAND += "${@ 'rootfs_install_clean_files' if (d.getVar('ROOTFS_CLEAN_FILES') or '').strip() else ''}"
 rootfs_install_clean_files[weight] = "2"
 rootfs_install_clean_files() {
-    sudo -E chroot '${ROOTFSDIR}' \
-        /bin/rm -f ${ROOTFS_CLEAN_FILES}
+    sudo -s <<'EOSUDO'
+    for clean_file in ${ROOTFS_CLEAN_FILES}; do
+        rm -f "${ROOTFSDIR}/$clean_file"
+    done
+EOSUDO
 }
 
 ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_install"
@@ -490,10 +493,10 @@ python do_generate_initramfs_setscene () {
 rootfs_generate_initramfs[progress] = "custom:rootfs_progress.InitrdProgressHandler"
 rootfs_generate_initramfs() {
     if [ -n "$(sudo find '${ROOTFSDIR}/boot' -type f -name 'vmlinu[xz]*')" ]; then
+        mods_total="$(sudo find '${ROOTFSDIR}/usr/lib/modules' -type f -name '*.ko*' | wc -l)"
+        echo "Total number of modules: $mods_total"
         sudo -E chroot "${ROOTFSDIR}" sh -c '\
-            mods_total="$(find /usr/lib/modules -type f -name '*.ko*' | wc -l)"; \
             export kernel_version=$(basename /boot/vmlinu[xz]-* | cut -d'-' -f2-); \
-            echo "Total number of modules: $mods_total"; \
             echo "Generating initrd for kernel version: $kernel_version"; \
             update-initramfs -u -v -k "$kernel_version";'
         if [ -n "${INITRD_DEPLOY_FILE}" ]; then
-- 
2.51.0

-- 
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/f547f9c01860fe224a3531b74d10db1d946cbcf5.1757930833.git.jan.kiszka%40siemens.com.

[PATCH 4/4] image-locales-extension: Optimize package removal

['Jan Kiszka' via isar-users]

From: Jan Kiszka <jan.kiszka@siemens.com>

"apt-get autopurge" was already available in buster. Using it saves one
startup of apt with database processing etc., which is slow in case of
cross-installation.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/image-locales-extension.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass
index 9149d643..b6b07dba 100644
--- a/meta/classes/image-locales-extension.bbclass
+++ b/meta/classes/image-locales-extension.bbclass
@@ -105,8 +105,7 @@ EOSH
         if [ "$localepurge_state" = 'p' ]
         then
             echo removing localepurge...
-            chroot '${ROOTFSDIR}' apt-get purge --yes localepurge
-            chroot '${ROOTFSDIR}' apt-get autoremove --purge --yes
+            chroot '${ROOTFSDIR}' apt-get autopurge --yes localepurge
         fi
 EOSUDO
 }
-- 
2.51.0

-- 
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/b3e6b363d167f4eeba1da7797489f155c9e4ffde.1757930833.git.jan.kiszka%40siemens.com.

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

['MOESSBAUER, Felix' via isar-users]

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

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany

-- 
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/eeaa04c2b665c1e386fcc6dc34f1bff149084bdb.camel%40siemens.com.

Re: [PATCH 2/4] sbuild-chroot: Skip initramfs generation while installing build dependencies

['MOESSBAUER, Felix' via isar-users]

On Mon, 2025-09-15 at 12:07 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> 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.


Thanks!

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

> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  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
> -- 
> 2.51.0

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany

-- 
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/04a8c408583b0c064e5a90484ce5f4750de1b649.camel%40siemens.com.