2018-04-12 01:42:24

by Rob Landley

[permalink] [raw]
Subject: [PATCH] Replace unnecessary perl with sed, printf, and the shell $(( )) operator.

You can build a kernel in a cross compiling environment that doesn't have perl
in the $PATH. Commit 429f7a062e3b broke that for 32 bit arm. Fix it.

Signed-off-by: Rob Landley <[email protected]>
---

arch/arm/boot/compressed/Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 45a6b9b..33ebeb2 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -117,11 +117,10 @@ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
asflags-y := -DZIMAGE

# Supply kernel BSS size to the decompressor via a linker symbol.
-KBSS_SZ = $(shell $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
- perl -e 'while (<>) { \
- $$bss_start=hex($$1) if /^([[:xdigit:]]+) B __bss_start$$/; \
- $$bss_end=hex($$1) if /^([[:xdigit:]]+) B __bss_stop$$/; \
- }; printf "%d\n", $$bss_end - $$bss_start;')
+KBSS_SZ := $(shell echo $$(($$(printf '%d+%d' $$( \
+ $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
+ sed -n -e 's/^\([^ ]*\) B __bss_start$$/-0x\1/p' \
+ -e 's/^\([^ ]*\) B __bss_stop$$/0x\1/p') ) )) )
LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
# Supply ZRELADDR to the decompressor via a linker symbol.
ifneq ($(CONFIG_AUTO_ZRELADDR),y)


2018-04-16 14:32:34

by Russell King (Oracle)

[permalink] [raw]
Subject: Re: [PATCH] Replace unnecessary perl with sed, printf, and the shell $(( )) operator.

On Wed, Apr 11, 2018 at 08:38:37PM -0500, Rob Landley wrote:
> You can build a kernel in a cross compiling environment that doesn't have perl
> in the $PATH. Commit 429f7a062e3b broke that for 32 bit arm. Fix it.
>
> Signed-off-by: Rob Landley <[email protected]>
> ---
>
> arch/arm/boot/compressed/Makefile | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
> index 45a6b9b..33ebeb2 100644
> --- a/arch/arm/boot/compressed/Makefile
> +++ b/arch/arm/boot/compressed/Makefile
> @@ -117,11 +117,10 @@ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
> asflags-y := -DZIMAGE
>
> # Supply kernel BSS size to the decompressor via a linker symbol.
> -KBSS_SZ = $(shell $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
> - perl -e 'while (<>) { \
> - $$bss_start=hex($$1) if /^([[:xdigit:]]+) B __bss_start$$/; \
> - $$bss_end=hex($$1) if /^([[:xdigit:]]+) B __bss_stop$$/; \
> - }; printf "%d\n", $$bss_end - $$bss_start;')
> +KBSS_SZ := $(shell echo $$(($$(printf '%d+%d' $$( \
> + $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
> + sed -n -e 's/^\([^ ]*\) B __bss_start$$/-0x\1/p' \
> + -e 's/^\([^ ]*\) B __bss_stop$$/0x\1/p') ) )) )

This looks more complicated than necessary, and therefore less readable.
What's wrong with:

KBSS_SZ := $(shell echo $$(($$($(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
sed -n -e 's/^\([^ ]*\) B __bss_start$$/-0x\1/p' \
-e 's/^\([^ ]*\) B __bss_stop$$/+0x\1/p') ))

The sed command produces output such as:

-0xc0955e58
+0xc10b0f9c

which the shell is then able to evaluate and produce a decimal number.
This seems to work fine with both bash and dash.

--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up

2018-04-16 14:33:13

by Rob Landley

[permalink] [raw]
Subject: Re: [PATCH] Replace unnecessary perl with sed, printf, and the shell $(( )) operator.

On 04/16/2018 07:09 AM, Russell King - ARM Linux wrote:
> On Wed, Apr 11, 2018 at 08:38:37PM -0500, Rob Landley wrote:
>> You can build a kernel in a cross compiling environment that doesn't have perl
>> in the $PATH. Commit 429f7a062e3b broke that for 32 bit arm. Fix it.
...
> This looks more complicated than necessary, and therefore less readable.
> What's wrong with:
>
> KBSS_SZ := $(shell echo $$(($$($(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \
> sed -n -e 's/^\([^ ]*\) B __bss_start$$/-0x\1/p' \
> -e 's/^\([^ ]*\) B __bss_stop$$/+0x\1/p') ))
>
> The sed command produces output such as:
>
> -0xc0955e58
> +0xc10b0f9c
>
> which the shell is then able to evaluate and produce a decimal number.
> This seems to work fine with both bash and dash.

Yes, that is better.

Acked-by: Rob Landley <[email protected]>

Thanks,

Rob