diff mbox series

[v6,01/10] refactor: move get_rootfs_distro from sdk into rootfs

Message ID 20251201085813.1616095-2-felix.moessbauer@siemens.com
State Accepted, archived
Headers show
Series Add SBOM generation with debsbom | expand

Commit Message

MOESSBAUER, Felix Dec. 1, 2025, 8:58 a.m. UTC 
This helper is rootfs (not sdk) specific and can be re-used to reliably
compute the distro of a rootfs (also transient ones like the ones used
by sbuild). As the SDK always is included into a rootfs, we just move it
there and make it reusable.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/rootfs.bbclass | 9 +++++++++
 meta/classes/sdk.bbclass    | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 70d4bfb8..3027c4dd 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -44,6 +44,15 @@  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"
 
+# helper to compute the rootfs distro also under cross building
+def get_rootfs_distro(d):
+    host_arch = d.getVar('HOST_ARCH')
+    distro_arch = d.getVar('DISTRO_ARCH')
+    if host_arch == distro_arch:
+        return d.getVar('DISTRO')
+    else:
+        return d.getVar('HOST_DISTRO')
+
 # Useful environment variables:
 export E = "${@ isar_export_proxies(d)}"
 export DEBIAN_FRONTEND = "noninteractive"
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 5933b52a..81d3c65e 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -43,14 +43,6 @@  SDK_PREINSTALL += " \
     devscripts \
     equivs"
 
-def get_rootfs_distro(d):
-    host_arch = d.getVar('HOST_ARCH')
-    distro_arch = d.getVar('DISTRO_ARCH')
-    if host_arch == distro_arch:
-        return d.getVar('DISTRO')
-    else:
-        return d.getVar('HOST_DISTRO')
-
 # rootfs/image overrides for the SDK
 ROOTFS_ARCH:class-sdk = "${HOST_ARCH}"
 ROOTFS_DISTRO:class-sdk = "${@get_rootfs_distro(d)}"