bootspec.bbclass: refactor bootspec options code

Make it a python method that can be called from the variable assignment instead of using anonymous python with an intermediate variable. Signed-off-by: Enrico Jörns <[email protected]>
pengutronix · Jun 7, 2024 · f1386c1 · f1386c1
1 parent 784262e
commit f1386c1
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/classes-recipe/bootspec.bbclass b/classes-recipe/bootspec.bbclass
@@ -26,21 +26,20 @@ BOOTSPEC_OPTIONS_squashfs-xz = "rootfstype=squashfs"
 BOOTSPEC_VERSION ?= "${PV}"
 BOOTSPEC_VERSION[doc] ?= "Content of the bootspec version entry"
 
-BOOTSPEC_OPTIONS_DEFAULT = ""
-
-python () {
+# Search in IMAGE_FSTYPES for a type we have a default for
+def bootspec_default_option(d):
     for type in (d.getVar('IMAGE_FSTYPES') or "").split():
         option = d.getVar('BOOTSPEC_OPTIONS_%s' % type)
         if option:
-            d.setVar('BOOTSPEC_OPTIONS_DEFAULT', option)
-            break;
+            return option
 
+python () {
     if d.getVar('PREFERRED_PROVIDER_virtual/dtb'):
         d.appendVarFlag('do_rootfs', 'depends', ' virtual/dtb:do_populate_sysroot')
         d.setVar('EXTERNAL_KERNEL_DEVICETREE', '${RECIPE_SYSROOT}/boot/devicetree')
 }
 
-BOOTSPEC_OPTIONS ?= "${BOOTSPEC_OPTIONS_DEFAULT}"
+BOOTSPEC_OPTIONS ?= "${@bootspec_default_option(d)}"
 BOOTSPEC_OPTIONS[doc] = "Content of the boot spec entry 'options' line"
 
 BOOTSPEC_EXTRALINE ?= ""