[PATCH 1/3] Blackfin: Wrap long "make help" text lines

[PATCH 1/3] Blackfin: Wrap long "make help" text lines

[Geert Uytterhoeven]

Some "make help" text lines extend beyond 80 characters. Wrap them at 79
characters.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Steven Miao <realmz6@gmail.com>
Cc: adi-buildroot-devel@lists.sourceforge.net
---
 arch/blackfin/Makefile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 1fce08632ad763ab..a6ce3ba90b6706a5 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -155,12 +155,18 @@ install:
 
 define archhelp
   echo  '* vmImage         - Alias to selected kernel format (vmImage.gz by default)'
-  echo  '  vmImage.bin     - Uncompressed Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bin)'
-  echo  '  vmImage.bz2     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'
-  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'
-  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'
-  echo  '  vmImage.lzo     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzo)'
-  echo  '  vmImage.xip     - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)'
+  echo  '  vmImage.bin     - Uncompressed Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.bin)'
+  echo  '  vmImage.bz2     - Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.bz2)'
+  echo  '* vmImage.gz      - Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.gz)'
+  echo  '  vmImage.lzma    - Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.lzma)'
+  echo  '  vmImage.lzo     - Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.lzo)'
+  echo  '  vmImage.xip     - XIP Kernel-only image for U-Boot'
+  echo  '                     (arch/$(ARCH)/boot/vmImage.xip)'
   echo  '  install         - Install kernel using'
   echo  '                     (your) ~/bin/$(INSTALLKERNEL) or'
   echo  '                     (distribution) PATH: $(INSTALLKERNEL) or'
-- 
1.9.1

[PATCH 2/3] kconfig: Wrap long "make help" text lines

[Geert Uytterhoeven]

Some "make help" text lines extend beyond 80 characters. Wrap them at 79
characters.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 scripts/kconfig/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index d9b1fef0c67e3cb4..d19de3665bfbe984 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -122,7 +122,8 @@ tinyconfig:
 # Help text used by make help
 help:
 	@echo  '  config	  - Update current config utilising a line-oriented program'
-	@echo  '  nconfig         - Update current config utilising a ncurses menu based program'
+	@echo  '  nconfig         - Update current config utilising a ncurses menu based'
+	@echo  '                    program'
 	@echo  '  menuconfig	  - Update current config utilising a menu based program'
 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
@@ -138,7 +139,8 @@ help:
 	@echo  '  alldefconfig    - New config with all symbols set to default'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  listnewconfig   - List new options'
-	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their default value'
+	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their'
+	@echo  '                    default value'
 	@echo  '  kvmconfig	  - Enable additional options for guest kernel support'
 	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'
 
-- 
1.9.1

Re: [PATCH 2/3] kconfig: Wrap long "make help" text lines

[Diego Viola]

Hello,

Can you please include a minor change in your patch?

At line 89, there's this:

# on its behavior(sets new symbols to their default value but not 'n') with the

Please change this line to this:

# on its behavior (sets new symbols to their default value but not 'n') with the

There should be a space between "behavior" and the parentheses/bracket.

Thanks,

Diego

On Tue, May 26, 2015 at 8:39 AM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> Some "make help" text lines extend beyond 80 characters. Wrap them at 79
> characters.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  scripts/kconfig/Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
> index d9b1fef0c67e3cb4..d19de3665bfbe984 100644
> --- a/scripts/kconfig/Makefile
> +++ b/scripts/kconfig/Makefile
> @@ -122,7 +122,8 @@ tinyconfig:
>  # Help text used by make help
>  help:
>         @echo  '  config          - Update current config utilising a line-oriented program'
> -       @echo  '  nconfig         - Update current config utilising a ncurses menu based program'
> +       @echo  '  nconfig         - Update current config utilising a ncurses menu based'
> +       @echo  '                    program'
>         @echo  '  menuconfig      - Update current config utilising a menu based program'
>         @echo  '  xconfig         - Update current config utilising a QT based front-end'
>         @echo  '  gconfig         - Update current config utilising a GTK based front-end'
> @@ -138,7 +139,8 @@ help:
>         @echo  '  alldefconfig    - New config with all symbols set to default'
>         @echo  '  randconfig      - New config with random answer to all options'
>         @echo  '  listnewconfig   - List new options'
> -       @echo  '  olddefconfig    - Same as silentoldconfig but sets new symbols to their default value'
> +       @echo  '  olddefconfig    - Same as silentoldconfig but sets new symbols to their'
> +       @echo  '                    default value'
>         @echo  '  kvmconfig       - Enable additional options for guest kernel support'
>         @echo  '  tinyconfig      - Configure the tiniest possible kernel'
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/3] kconfig: Wrap long "make help" text lines

[Geert Uytterhoeven]

On Sun, May 31, 2015 at 3:10 AM, Diego Viola <diego.viola@gmail.com> wrote:
> Can you please include a minor change in your patch?
>
> At line 89, there's this:
>
> # on its behavior(sets new symbols to their default value but not 'n') with the
>
> Please change this line to this:
>
> # on its behavior (sets new symbols to their default value but not 'n') with the
>
> There should be a space between "behavior" and the parentheses/bracket.

That's an unrelated change in an unrelated part of my patch.

Please send a separate patch to fix that.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/3] kconfig: Wrap long "make help" text lines

[Diego Viola]

Okay, will do.

Diego

On Sun, May 31, 2015 at 5:26 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Sun, May 31, 2015 at 3:10 AM, Diego Viola <diego.viola@gmail.com> wrote:
>> Can you please include a minor change in your patch?
>>
>> At line 89, there's this:
>>
>> # on its behavior(sets new symbols to their default value but not 'n') with the
>>
>> Please change this line to this:
>>
>> # on its behavior (sets new symbols to their default value but not 'n') with the
>>
>> There should be a space between "behavior" and the parentheses/bracket.
>
> That's an unrelated change in an unrelated part of my patch.
>
> Please send a separate patch to fix that.
>
> Gr{oetje,eeting}s,
>
>                         Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

Re: [PATCH 2/3] kconfig: Wrap long "make help" text lines

[Diego Viola]

Done.

On Sun, May 31, 2015 at 9:53 AM, Diego Viola <diego.viola@gmail.com> wrote:
> Okay, will do.
>
> Diego
>
> On Sun, May 31, 2015 at 5:26 AM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
>> On Sun, May 31, 2015 at 3:10 AM, Diego Viola <diego.viola@gmail.com> wrote:
>>> Can you please include a minor change in your patch?
>>>
>>> At line 89, there's this:
>>>
>>> # on its behavior(sets new symbols to their default value but not 'n') with the
>>>
>>> Please change this line to this:
>>>
>>> # on its behavior (sets new symbols to their default value but not 'n') with the
>>>
>>> There should be a space between "behavior" and the parentheses/bracket.
>>
>> That's an unrelated change in an unrelated part of my patch.
>>
>> Please send a separate patch to fix that.
>>
>> Gr{oetje,eeting}s,
>>
>>                         Geert
>>
>> --
>> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>>
>> In personal conversations with technical people, I call myself a hacker. But
>> when I'm talking to journalists I just say "programmer" or something like that.
>>                                 -- Linus Torvalds

Re: [PATCH 2/3] kconfig: Wrap long "make help" text lines

[Michal Marek]

On Tue, May 26, 2015 at 01:39:54PM +0200, Geert Uytterhoeven wrote:
> Some "make help" text lines extend beyond 80 characters. Wrap them at 79
> characters.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Applied to kbuild.git#kconfig.

Michal

[PATCH 3/3] kconfig: Extend defconfig field size from 24 to 32

[Geert Uytterhoeven]

next-20150526 has 12 defconfigs with names longer than 24 characters,
breaking alignment in "make help".

The "winners" are "atngw100mkii_evklcd100_defconfig" and
"atngw100mkii_evklcd101_defconfig", counting in at 32 characters.

Extend the defconfig field size to 32 to restore alignment.
Don't use a larger value, to not encourage people to create even longer
defconfig names.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 92a70785920535c6..ac6fa61b2cf3b222 100644
--- a/Makefile
+++ b/Makefile
@@ -1300,7 +1300,7 @@ help:
 	@echo  ''
 	@$(if $(boards), \
 		$(foreach b, $(boards), \
-		printf "  %-24s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
+		printf "  %-32s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
 		echo '')
 	@$(if $(board-dirs), \
 		$(foreach b, $(board-dirs), \
-- 
1.9.1

Re: [PATCH 3/3] kconfig: Extend defconfig field size from 24 to 32

[Hans-Christian Egtvedt]

Around Tue 26 May 2015 13:39:55 +0200 or thereabout, Geert Uytterhoeven wrote:
> next-20150526 has 12 defconfigs with names longer than 24 characters,
> breaking alignment in "make help".
> 
> The "winners" are "atngw100mkii_evklcd100_defconfig" and
> "atngw100mkii_evklcd101_defconfig", counting in at 32 characters.
> 
> Extend the defconfig field size to 32 to restore alignment.
> Don't use a larger value, to not encourage people to create even longer
> defconfig names.

(-:

They were very explicit to the ordering code.

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>

Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>

> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

<snipp diff>

-- 
mvh
Hans-Christian Egtvedt