From patchwork Thu Nov 12 09:10:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannu Nyman X-Patchwork-Id: 543280 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A57581402A3 for ; Thu, 12 Nov 2015 20:11:22 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2EAB328C0FE; Thu, 12 Nov 2015 10:09:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id F1CA228C056 for ; Thu, 12 Nov 2015 10:09:08 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from filtteri6.pp.htv.fi (filtteri6.pp.htv.fi [213.243.153.189]) by arrakis.dune.hu (Postfix) with ESMTP for ; Thu, 12 Nov 2015 10:09:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id 51C3F56F844; Thu, 12 Nov 2015 11:11:02 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id zB4FpPS7UVAG; Thu, 12 Nov 2015 11:10:58 +0200 (EET) Received: from localhost.localdomain (87-100-236-80.bb.dnainternet.fi [87.100.236.80]) by smtp4.welho.com (Postfix) with ESMTP id 562FA5BC022; Thu, 12 Nov 2015 11:10:58 +0200 (EET) From: Hannu Nyman To: openwrt-devel@lists.openwrt.org Date: Thu, 12 Nov 2015 11:10:56 +0200 Message-Id: <1447319456-2881-1-git-send-email-hannu.nyman@iki.fi> X-Mailer: git-send-email 2.5.0 Cc: Hannu Nyman Subject: [OpenWrt-Devel] [PATCH] scripts/diffconfig.sh: reduce config output with CONFIG_BUSYBOX_CUSTOM X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Use similar approach as r47461 to reduce output for busybox config. Since r39435 CONFIG_BUSYBOX_CUSTOM=y has caused the addition of all ~260 busybox config options to the diffconfig output even if only one option has been changed. This patch eliminates the unchanged busybox config options from the output and leaves only the actually modified options. Signed-off-by: Hannu Nyman --- Reference to: https://dev.openwrt.org/changeset/39435 https://dev.openwrt.org/changeset/47461 For me this change eliminates 261 unnecessary busybox lines from diffconfig output, leaving only the 4 actually changed busybox options. perus@ub1510:/Openwrt/trunk$ wc diff-* 416 422 14746 base.diffconfig 155 161 4669 new.diffconfig scripts/diffconfig.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh index d26e9a9..f195d18 100755 --- a/scripts/diffconfig.sh +++ b/scripts/diffconfig.sh @@ -4,6 +4,7 @@ grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head grep '^CONFIG_ALL_KMODS=y' .config >> tmp/.diffconfig.head grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head +grep '^CONFIG_BUSYBOX_CUSTOM=y' .config >> tmp/.diffconfig.head ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null ./scripts/kconfig.pl '>+' tmp/.diffconfig.stage1 .config >> tmp/.diffconfig.head ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null