The patch titled
Subject: remove recently added perl build requirement
has been added to the -mm tree. Its filename is
remove-recently-added-perl-build-requirement.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/remove-recently-added-perl-build-requirement.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/remove-recently-added-perl-build-requirement.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Rob Landley <rob@xxxxxxxxxxx>
Subject: remove recently added perl build requirement
Commit e6023367d779 ("x86, kaslr: Prevent .bss from overlaping initrd")
added perl back to the kernel build dependencies in -rc6.
Replace those 39 lines of perl with 4 lines of shell script.
Note: checkpatch.pl isn't a build dependency, it's a development
dependency (like bloat-o-meter being written in python or "make xconfig"
needing QT). Those aren't things you need to add to your cross compile
environment to produce a binary. Different category of dependency.
For more history on the issue, see https://lkml.org/lkml/2013/2/27/18
Signed-off-by: Rob Landley <rob@xxxxxxxxxxx>
Acked-by: Anca Emanuel <anca.emanuel@xxxxxxxxx>
Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Junjie Mao <eternal.n08@xxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/boot/compressed/Makefile | 6 ++--
arch/x86/tools/calc_run_size.pl | 39 ----------------------------
2 files changed, 4 insertions(+), 41 deletions(-)
diff -puN arch/x86/boot/compressed/Makefile~remove-recently-added-perl-build-requirement arch/x86/boot/compressed/Makefile
--- a/arch/x86/boot/compressed/Makefile~remove-recently-added-perl-build-requirement
+++ a/arch/x86/boot/compressed/Makefile
@@ -89,8 +89,10 @@ suffix-$(CONFIG_KERNEL_XZ) := xz
suffix-$(CONFIG_KERNEL_LZO) := lzo
suffix-$(CONFIG_KERNEL_LZ4) := lz4
-RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux | \
- perl $(srctree)/arch/x86/tools/calc_run_size.pl)
+RUN_SIZE = $(shell NUM='\([0-9a-fA-F]*[ \t]*\)'; $(OBJDUMP) -h vmlinux | \
+sed -n 's/^[ \t0-9]*.b[sr][sk][ \t]*'"$$NUM$$NUM$$NUM$$NUM"'.*/\1\4/p' | \
+xargs | while read a b c d; do [ "$$b" != "$$d" ] && exit 1; \
+expr $$(printf "%d + %d + %d" 0x$$a 0x$$b 0x$$c); done)
quiet_cmd_mkpiggy = MKPIGGY $@
cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false )
diff -puN arch/x86/tools/calc_run_size.pl~remove-recently-added-perl-build-requirement /dev/null
--- a/arch/x86/tools/calc_run_size.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-#
-# Calculate the amount of space needed to run the kernel, including room for
-# the .bss and .brk sections.
-#
-# Usage:
-# objdump -h a.out | perl calc_run_size.pl
-use strict;
-
-my $mem_size = 0;
-my $file_offset = 0;
-
-my $sections=" *[0-9]+ \.(?:bss|brk) +";
-while (<>) {
- if (/^$sections([0-9a-f]+) +(?:[0-9a-f]+ +){2}([0-9a-f]+)/) {
- my $size = hex($1);
- my $offset = hex($2);
- $mem_size += $size;
- if ($file_offset == 0) {
- $file_offset = $offset;
- } elsif ($file_offset != $offset) {
- # BFD linker shows the same file offset in ELF.
- # Gold linker shows them as consecutive.
- next if ($file_offset + $mem_size == $offset + $size);
-
- printf STDERR "file_offset: 0x%lx\n", $file_offset;
- printf STDERR "mem_size: 0x%lx\n", $mem_size;
- printf STDERR "offset: 0x%lx\n", $offset;
- printf STDERR "size: 0x%lx\n", $size;
-
- die ".bss and .brk are non-contiguous\n";
- }
- }
-}
-
-if ($file_offset == 0) {
- die "Never found .bss or .brk file offset\n";
-}
-printf("%d\n", $mem_size + $file_offset);
_
Patches currently in -mm which might be from rob@xxxxxxxxxxx are
remove-recently-added-perl-build-requirement.patch
init-remove-config_init_fallback.patch
rtc-rtc-isl12057-add-isilirq2-can-wakeup-machine-property-for-in-tree-users.patch
arm-mvebu-isl12057-rtc-chip-can-now-wake-up-rn102-rn102-and-rn2120.patch
linux-next.patch
dt-bindings-use-isil-prefix-for-intersil.patch
rtc-isl12022-deprecate-use-of-isl-in-compatible-string-for-isil.patch
rtc-isl12057-deprecate-use-of-isl-in-compatible-string-for-isil.patch
staging-iio-isl29028-deprecate-use-of-isl-in-compatible-string-for-isil.patch
arm-dts-zynq-update-isl9305-compatible-string-to-use-isil-vendor-prefix.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html