From patchwork Wed Sep 21 05:22:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 4207 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0354123EF9 for ; Wed, 21 Sep 2011 05:22:55 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id E0775A18556 for ; Wed, 21 Sep 2011 05:22:54 +0000 (UTC) Received: by fxe23 with SMTP id 23so1833051fxe.11 for ; Tue, 20 Sep 2011 22:22:54 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr386815fad.122.1316582574591; Tue, 20 Sep 2011 22:22:54 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs106792lad; Tue, 20 Sep 2011 22:22:54 -0700 (PDT) Received: by 10.231.25.19 with SMTP id x19mr629604ibb.16.1316582571144; Tue, 20 Sep 2011 22:22:51 -0700 (PDT) Received: from e3.ny.us.ibm.com (e3.ny.us.ibm.com. [32.97.182.143]) by mx.google.com with ESMTPS id r3si821000ibr.11.2011.09.20.22.22.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Sep 2011 22:22:51 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.143 as permitted sender) client-ip=32.97.182.143; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.143 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by us.ibm.com with XMail ESMTP for from ; Wed, 21 Sep 2011 01:22:49 -0400 Received: from d01relay06.pok.ibm.com ([9.56.227.116]) by us.ibm.com ([192.168.1.103]) with XMail ESMTP; Wed, 21 Sep 2011 01:22:47 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8L5MksY1638418; Wed, 21 Sep 2011 01:22:46 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8L5MjFP004667; Wed, 21 Sep 2011 01:22:46 -0400 Received: from kernel.beaverton.ibm.com ([9.47.67.96]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p8L5MifJ004622; Wed, 21 Sep 2011 01:22:44 -0400 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 3CFEB1E750F; Tue, 20 Sep 2011 22:22:44 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Sam Ravnborg , gthelen@google.com, tartler@cs.fau.de, Dmitry Fink , Darren Hart , Eric B Munson , Bruce Ashfield , Michal Marek , linux-kbuild@vger.kernel.org Subject: [PATCH] kconfig: Add merge_config.sh script Date: Tue, 20 Sep 2011 22:22:41 -0700 Message-Id: <1316582561-23066-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 x-cbid: 11092105-8974-0000-0000-0000004E2AED After noticing almost every distro has their own method of managing config fragments, I went looking at some best practices, and wanted to try to consolidate some of the different approaches so this fairly simple infrastructure can be shared (and new distros/build systems don't have to implement yet another config fragment merge script). This script is most influenced by the Windriver tools used in the Yocto Project, reusing some portions found there. This script merges multiple config fragments, warning on any overrided values. It then sets any unspecified values to their default, then finally checks to make sure no specified value was dropped due to unsatisfied dependencies. I'm sure I'm sure this implementation won't work for everyone, and I expect it will need to evolve to adapt for various use cases. But I think its a reasonable starting point. v2: Reworked to use alldefconfig instead of the proposed olddefconfig as suggested by Sam Ravnborg. Thanks to Darren Hart for early review and feedback! Please let me know if you have any comments or thoughts! CC: Sam Ravnborg CC: gthelen@google.com CC: tartler@cs.fau.de CC: Dmitry Fink CC: Darren Hart CC: Eric B Munson CC: Bruce Ashfield CC: Michal Marek CC: linux-kbuild@vger.kernel.org Signed-off-by: John Stultz --- scripts/kconfig/merge_config.sh | 71 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) create mode 100755 scripts/kconfig/merge_config.sh diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh new file mode 100755 index 0000000..fda0139 --- /dev/null +++ b/scripts/kconfig/merge_config.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# merge_config.sh - Takes a list of config fragment values, and merges +# them one by one. Provides warnings on overridden values, and specified +# values that did not make it to the resulting .config file (due to missed +# dependencies or config symbol removal). +# +# Portions reused from kconf_check and generate_cfg: +# http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/kconf_check +# http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/generate_cfg +# +# Copyright (c) 2009-2010 Wind River Systems, Inc. +# Copyright 2011 Linaro +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. + +MERGE_LIST=$* + + +TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) + +# Merge files, printing warnings on overrided values +for MERGE_FILE in $MERGE_LIST ; do + echo "Merging $MERGE_FILE" + CFG_LIST=`cat $MERGE_FILE | \ + sed 's/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/'` + for CFG in $CFG_LIST ; do + grep -q -w $CFG $TMP_FILE + if [ $? == 0 ] ; then + PREV_VAL=`grep -w $CFG $TMP_FILE` + NEW_VAL=`grep -w $CFG $MERGE_FILE` + if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then + echo Value of $CFG is redefined by fragment $MERGE_FILE: + echo Previous value: `grep -w $CFG $TMP_FILE` + echo New value: `grep -w $CFG $MERGE_FILE` + echo + fi + sed -i "/$CFG[ =]/d" $TMP_FILE + fi + done + cat $MERGE_FILE >> $TMP_FILE +done + + +# Use the merged file as the starting point for alldefconfig +# (Fills in any missing symbols with Kconfig default) +make KCONFIG_ALLCONFIG=$TMP_FILE alldefconfig + +# Check all specified config values took (might have missed-dependency issues) +cat $TMP_FILE | while read line; do + CFG=`echo $line | \ + sed 's/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/'` + + REQUESTED_VAL=`grep -w -e "$CFG" $TMP_FILE` + ACTUAL_VAL=`grep -w -e "$CFG" .config` + if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then + echo "Value requested for $CFG not in final .config" + echo "Requested value: $REQUESTED_VAL" + echo "Actual value: $ACTUAL_VAL" + echo "" + fi +done + +# Cleanup +rm $TMP_FILE