[PATCH v3 1/6] oe_mkimage: Use consistent indentation

Joel Stanley joel at jms.id.au
Wed Feb 24 09:54:43 AEDT 2016


On Wed, Feb 24, 2016 at 1:14 AM, Andrew Jeffery <andrew at aj.id.au> wrote:
> It was inconsistent with the rest of the file, which seems to use 7
> spaces. In particular, vim-sleuth was detecting the indentation style
> from the first indent(s) in the file, which were in the oe_mkimage
> function.

7 spaces seems kind of unusual.

Upstream bbclass files are a mixture; I'd go with 8 spaces as I
suspect that was the intent in this file.

>
> Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
> ---
>  meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
> index c390c36..bf987bb 100644
> --- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
> +++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
> @@ -4,9 +4,9 @@ inherit image_types_uboot
>  # the image load address and entry point. Override it here.
>
>  oe_mkimage () {
> -    mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_BASENAME} \
> -        -a ${INITRD_IMAGE_LOADADDRESS} -e ${INITRD_IMAGE_ENTRYPOINT} \
> -        -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
> +       mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_BASENAME} \
> +              -a ${INITRD_IMAGE_LOADADDRESS} -e ${INITRD_IMAGE_ENTRYPOINT} \
> +              -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
>  }
>
>  INITRD_IMAGE_ENTRYPOINT ?= "0x40800000"
> --
> 2.5.0
>
> _______________________________________________
> openbmc mailing list
> openbmc at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc


More information about the openbmc mailing list