From: Adrian Freihofer <adrian.freiho...@siemens.com>

white space changes only.
- python part should be 4 spaces, not 8.
- use tabs for shell

Signed-off-by: Adrian Freihofer <adrian.freiho...@siemens.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit 000079a973e8c97d496ca721259437880a7ea70d)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
---
 meta/classes-recipe/kernel-fitimage.bbclass | 64 ++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass 
b/meta/classes-recipe/kernel-fitimage.bbclass
index 4b74ddc201..16c8d88802 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -29,27 +29,27 @@ KERNEL_IMAGETYPE_REPLACEMENT ?= 
"${@get_fit_replacement_type(d)}"
 DEPENDS:append = " ${@'u-boot-tools-native dtc-native' if 'fitImage' in 
(d.getVar('KERNEL_IMAGETYPES') or '').split() else ''}"
 
 python __anonymous () {
-        # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
-        # to kernel.bbclass . We have to override it, since we pack zImage
-        # (at least for now) into the fitImage .
-        typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
-        if 'fitImage' in typeformake.split():
-            d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', 
typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT')))
-
-        image = d.getVar('INITRAMFS_IMAGE')
-        if image:
-            d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' 
${INITRAMFS_IMAGE}:do_image_complete')
-
-        ubootenv = d.getVar('UBOOT_ENV')
-        if ubootenv:
-            d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
virtual/bootloader:do_populate_sysroot')
-
-        #check if there are any dtb providers
-        providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
-        if providerdtb:
-            d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
virtual/dtb:do_populate_sysroot')
-            d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' 
virtual/dtb:do_populate_sysroot')
-            d.setVar('EXTERNAL_KERNEL_DEVICETREE', 
"${RECIPE_SYSROOT}/boot/devicetree")
+    # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
+    # to kernel.bbclass . We have to override it, since we pack zImage
+    # (at least for now) into the fitImage .
+    typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
+    if 'fitImage' in typeformake.split():
+        d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', 
d.getVar('KERNEL_IMAGETYPE_REPLACEMENT')))
+
+    image = d.getVar('INITRAMFS_IMAGE')
+    if image:
+        d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' 
${INITRAMFS_IMAGE}:do_image_complete')
+
+    ubootenv = d.getVar('UBOOT_ENV')
+    if ubootenv:
+        d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
virtual/bootloader:do_populate_sysroot')
+
+    #check if there are any dtb providers
+    providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
+    if providerdtb:
+        d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
virtual/dtb:do_populate_sysroot')
+        d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' 
virtual/dtb:do_populate_sysroot')
+        d.setVar('EXTERNAL_KERNEL_DEVICETREE', 
"${RECIPE_SYSROOT}/boot/devicetree")
 }
 
 
@@ -480,13 +480,13 @@ fitimage_emit_section_config() {
                # default node is selected based on dtb ID if it is present,
                # otherwise its selected based on kernel ID
                if [ -n "$dtb_image" ]; then
-                       # Select default node as user specified dtb when
-                       # multiple dtb exists.
-                       if [ -n "$default_dtb_image" ]; then
-                               default_line="default = 
\"${FIT_CONF_PREFIX}$default_dtb_image\";"
-                       else
-                               default_line="default = 
\"${FIT_CONF_PREFIX}$dtb_image\";"
-                       fi
+                       # Select default node as user specified dtb when
+                       # multiple dtb exists.
+                       if [ -n "$default_dtb_image" ]; then
+                               default_line="default = 
\"${FIT_CONF_PREFIX}$default_dtb_image\";"
+                       else
+                               default_line="default = 
\"${FIT_CONF_PREFIX}$dtb_image\";"
+                       fi
                else
                        default_line="default = 
\"${FIT_CONF_PREFIX}$kernel_id\";"
                fi
@@ -605,9 +605,9 @@ fitimage_assemble() {
                                DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB"
                        fi
 
-                       # Strip off the path component from the filename
+                       # Strip off the path component from the filename
                        if "${@'false' if 
oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then
-                           DTB=`basename $DTB`
+                               DTB=`basename $DTB`
                        fi
 
                        # Set the default dtb image if it exists in the 
devicetree.
@@ -715,8 +715,8 @@ fitimage_assemble() {
        # kernel-fitimage.bbclass currently only supports a single kernel (no 
less or
        # more) to be added to the FIT image along with 0 or more device trees 
and
        # 0 or 1 ramdisk.
-        # It is also possible to include an initramfs bundle (kernel and 
rootfs in one binary)
-        # When the initramfs bundle is used ramdisk is disabled.
+       # It is also possible to include an initramfs bundle (kernel and rootfs 
in one binary)
+       # When the initramfs bundle is used ramdisk is disabled.
        # If a device tree is to be part of the FIT image, then select
        # the default configuration to be used is based on the dtbcount. If 
there is
        # no dtb present than select the default configuation to be based on
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#205084): 
https://lists.openembedded.org/g/openembedded-core/message/205084
Mute This Topic: https://lists.openembedded.org/mt/108728938/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to