All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Landley <rob@landley.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Fengguang Wu <fengguang.wu@intel.com>,
	Junjie Mao <eternal.n08@gmail.com>,
	Kees Cook <keescook@chromium.org>,
	stable@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCHv2] remove recently added perl build requirement
Date: Mon, 12 Jan 2015 10:54:43 -0600	[thread overview]
Message-ID: <54B3FC53.7080702@landley.net> (raw)
In-Reply-To: <20150106155024.5efa209d575fff4868758482@linux-foundation.org>

From: Rob Landley <rob@landley.net>

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.

Signed-off-by: Rob Landley <rob@landley.net>
Acked-by: Anca Emanuel <anca.emanuel@gmail.com>
---

 arch/x86/boot/compressed/Makefile |    6 ++--
 arch/x86/tools/calc_run_size.pl   |   39 ----------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

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

--- linux/arch/x86/boot/compressed/Makefile
+++ linux/arch/x86/boot/compressed/Makefile
@@ -89,8 +76,10 @@
 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 )
 
--- linux/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);

  reply	other threads:[~2015-01-12 16:54 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-06 23:41 [PATCH] out out damn perl Rob Landley
2015-01-06 23:50 ` Andrew Morton
2015-01-12 16:54   ` Rob Landley [this message]
2015-01-13  1:01     ` [PATCHv2] remove recently added perl build requirement Kees Cook
2015-01-17  8:01   ` [PATCH] out out damn perl Pavel Machek
2015-01-17 11:56     ` Geert Uytterhoeven
2015-01-17 19:55     ` Rob Landley
2015-01-12 15:16 ` Lennart Sorensen
2015-01-12 15:25   ` Borislav Petkov
2015-01-12 15:27   ` Richard Weinberger
2015-01-12 16:14     ` Rob Landley
2015-01-12 16:17       ` Richard Weinberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54B3FC53.7080702@landley.net \
    --to=rob@landley.net \
    --cc=akpm@linux-foundation.org \
    --cc=eternal.n08@gmail.com \
    --cc=fengguang.wu@intel.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.