From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756457AbZIKUCq (ORCPT ); Fri, 11 Sep 2009 16:02:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756311AbZIKUCo (ORCPT ); Fri, 11 Sep 2009 16:02:44 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:53756 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756197AbZIKUAc (ORCPT ); Fri, 11 Sep 2009 16:00:32 -0400 Message-Id: <20090911200034.663899948@goodmis.org> References: <20090911195849.451244684@goodmis.org> User-Agent: quilt/0.46-1 Date: Fri, 11 Sep 2009 15:58:57 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Andrew Morton , Ingo Molnar , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Dick Streefland , Stephen Rothwell Subject: [PATCH 08/15] kconfig: have extract-ikconfig read ELF files Content-Disposition: inline; filename=0008-kconfig-have-extract-ikconfig-read-ELF-files.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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." -- 1.6.3.3 --