diff options
| author | Adrian Freihofer <adrian.freihofer@siemens.com> | 2024-07-15 16:10:38 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-10-02 06:15:15 -0700 |
| commit | bf9a4b750d02de0a37dff81869226db666a67938 (patch) | |
| tree | 5a416c6974753ef97bcfa2e406d006a42eeb6dd4 | |
| parent | 8f0499abe6f1043d9bdcdc95d4c0896b1f2333bc (diff) | |
| download | poky-bf9a4b750d02de0a37dff81869226db666a67938.tar.gz | |
kernel-fitimage: fix intentation
white space changes only.
- python part should be 4 spaces, not 8.
- use tabs for shell
(From OE-Core rev: 667aab25e83c84c0daccd43eda574ae34c75c8a7)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 000079a973e8c97d496ca721259437880a7ea70d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes-recipe/kernel-fitimage.bbclass | 64 |
1 files 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)}" | |||
| 29 | DEPENDS:append = " ${@'u-boot-tools-native dtc-native' if 'fitImage' in (d.getVar('KERNEL_IMAGETYPES') or '').split() else ''}" | 29 | DEPENDS:append = " ${@'u-boot-tools-native dtc-native' if 'fitImage' in (d.getVar('KERNEL_IMAGETYPES') or '').split() else ''}" |
| 30 | 30 | ||
| 31 | python __anonymous () { | 31 | python __anonymous () { |
| 32 | # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal | 32 | # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal |
| 33 | # to kernel.bbclass . We have to override it, since we pack zImage | 33 | # to kernel.bbclass . We have to override it, since we pack zImage |
| 34 | # (at least for now) into the fitImage . | 34 | # (at least for now) into the fitImage . |
| 35 | typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" | 35 | typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" |
| 36 | if 'fitImage' in typeformake.split(): | 36 | if 'fitImage' in typeformake.split(): |
| 37 | d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT'))) | 37 | d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT'))) |
| 38 | 38 | ||
| 39 | image = d.getVar('INITRAMFS_IMAGE') | 39 | image = d.getVar('INITRAMFS_IMAGE') |
| 40 | if image: | 40 | if image: |
| 41 | d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') | 41 | d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') |
| 42 | 42 | ||
| 43 | ubootenv = d.getVar('UBOOT_ENV') | 43 | ubootenv = d.getVar('UBOOT_ENV') |
| 44 | if ubootenv: | 44 | if ubootenv: |
| 45 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/bootloader:do_populate_sysroot') | 45 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/bootloader:do_populate_sysroot') |
| 46 | 46 | ||
| 47 | #check if there are any dtb providers | 47 | #check if there are any dtb providers |
| 48 | providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb") | 48 | providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb") |
| 49 | if providerdtb: | 49 | if providerdtb: |
| 50 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/dtb:do_populate_sysroot') | 50 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/dtb:do_populate_sysroot') |
| 51 | d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' virtual/dtb:do_populate_sysroot') | 51 | d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' virtual/dtb:do_populate_sysroot') |
| 52 | d.setVar('EXTERNAL_KERNEL_DEVICETREE', "${RECIPE_SYSROOT}/boot/devicetree") | 52 | d.setVar('EXTERNAL_KERNEL_DEVICETREE', "${RECIPE_SYSROOT}/boot/devicetree") |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | 55 | ||
| @@ -480,13 +480,13 @@ fitimage_emit_section_config() { | |||
| 480 | # default node is selected based on dtb ID if it is present, | 480 | # default node is selected based on dtb ID if it is present, |
| 481 | # otherwise its selected based on kernel ID | 481 | # otherwise its selected based on kernel ID |
| 482 | if [ -n "$dtb_image" ]; then | 482 | if [ -n "$dtb_image" ]; then |
| 483 | # Select default node as user specified dtb when | 483 | # Select default node as user specified dtb when |
| 484 | # multiple dtb exists. | 484 | # multiple dtb exists. |
| 485 | if [ -n "$default_dtb_image" ]; then | 485 | if [ -n "$default_dtb_image" ]; then |
| 486 | default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";" | 486 | default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";" |
| 487 | else | 487 | else |
| 488 | default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" | 488 | default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" |
| 489 | fi | 489 | fi |
| 490 | else | 490 | else |
| 491 | default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" | 491 | default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" |
| 492 | fi | 492 | fi |
| @@ -605,9 +605,9 @@ fitimage_assemble() { | |||
| 605 | DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB" | 605 | DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB" |
| 606 | fi | 606 | fi |
| 607 | 607 | ||
| 608 | # Strip off the path component from the filename | 608 | # Strip off the path component from the filename |
| 609 | if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then | 609 | if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then |
| 610 | DTB=`basename $DTB` | 610 | DTB=`basename $DTB` |
| 611 | fi | 611 | fi |
| 612 | 612 | ||
| 613 | # Set the default dtb image if it exists in the devicetree. | 613 | # Set the default dtb image if it exists in the devicetree. |
| @@ -715,8 +715,8 @@ fitimage_assemble() { | |||
| 715 | # kernel-fitimage.bbclass currently only supports a single kernel (no less or | 715 | # kernel-fitimage.bbclass currently only supports a single kernel (no less or |
| 716 | # more) to be added to the FIT image along with 0 or more device trees and | 716 | # more) to be added to the FIT image along with 0 or more device trees and |
| 717 | # 0 or 1 ramdisk. | 717 | # 0 or 1 ramdisk. |
| 718 | # It is also possible to include an initramfs bundle (kernel and rootfs in one binary) | 718 | # It is also possible to include an initramfs bundle (kernel and rootfs in one binary) |
| 719 | # When the initramfs bundle is used ramdisk is disabled. | 719 | # When the initramfs bundle is used ramdisk is disabled. |
| 720 | # If a device tree is to be part of the FIT image, then select | 720 | # If a device tree is to be part of the FIT image, then select |
| 721 | # the default configuration to be used is based on the dtbcount. If there is | 721 | # the default configuration to be used is based on the dtbcount. If there is |
| 722 | # no dtb present than select the default configuation to be based on | 722 | # no dtb present than select the default configuation to be based on |
