From patchwork Thu Apr 30 18:50:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 21222 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3UIqNjG023933 for ; Thu, 30 Apr 2009 18:52:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764397AbZD3Sw0 (ORCPT ); Thu, 30 Apr 2009 14:52:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764325AbZD3Sw0 (ORCPT ); Thu, 30 Apr 2009 14:52:26 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:56335 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764351AbZD3SwX (ORCPT ); Thu, 30 Apr 2009 14:52:23 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta01.mail.rr.com with ESMTP id <20090430185222986.VSDO11305@hrndva-omta01.mail.rr.com>; Thu, 30 Apr 2009 18:52:22 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1LzbMs-0000hl-BQ; Thu, 30 Apr 2009 14:52:22 -0400 Message-Id: <20090430185221.582053988@goodmis.org> References: <20090430185022.122124349@goodmis.org> User-Agent: quilt/0.46-1 Date: Thu, 30 Apr 2009 14:50:27 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg Subject: [PATCH 5/7] kconfig: have extract-ikconfig read ELF files Content-Disposition: inline; filename=0005-kconfig-have-extract-ikconfig-read-ELF-files.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Steven Rostedt It would be nice to use extract-ikconfig to find the congfig.gz in either vmlinux (not vmlinuz) or configs.ko. This patch changes the script to also be able to read ELF files directly. [ Impact: find config.gz in vmlinux and configs.ko ] Signed-off-by: Steven Rostedt --- scripts/extract-ikconfig | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig index 42d6bce..de233ff 100755 --- a/scripts/extract-ikconfig +++ b/scripts/extract-ikconfig @@ -59,6 +59,8 @@ dump_config "$image" GZHDR1="0x1f 0x8b 0x08 0x00" GZHDR2="0x1f 0x8b 0x08 0x08" +ELFHDR="0x7f 0x45 0x4c 0x46" + # vmlinux.gz: Check for a compressed images off=`$binoffset "$image" $GZHDR1 2>/dev/null` [ "$?" != "0" ] && off="-1" @@ -73,6 +75,14 @@ elif [ "$off" -ne "-1" ]; then (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \ zcat >"$TMPFILE" dump_config "$TMPFILE" + +# check if this is simply an ELF file +else + off=`$binoffset "$image" $ELFHDR 2>/dev/null` + [ "$?" != "0" ] && off="-1" + if [ "$off" -eq "0" ]; then + dump_config "$image" + fi fi echo "ERROR: Unable to extract kernel configuration information."