Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753726AbbKQOep (ORCPT ); Tue, 17 Nov 2015 09:34:45 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34655 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753506AbbKQOel (ORCPT ); Tue, 17 Nov 2015 09:34:41 -0500 From: Bamvor Jian Zhang To: linux-api@vger.kernel.org Cc: linux-kernel@vger.kernel.org, shuahkh@osg.samsung.com, khilman@linaro.org, tyler.baker@linaro.org, broonie@kernel.org, mpe@ellerman.id.au, dvhart@infradead.org, Bamvor Jian Zhang Subject: [PATCH V2 2/2] scripts/kconfig/Makefile: add kselftest-mergeconfig Date: Tue, 17 Nov 2015 22:34:17 +0800 Message-Id: <1447770857-9883-3-git-send-email-bamvor.zhangjian@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447770857-9883-1-git-send-email-bamvor.zhangjian@linaro.org> References: <1447770857-9883-1-git-send-email-bamvor.zhangjian@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1816 Lines: 46 Add kselftest-mergeconfig to enable the dependencies of kernel config for all the kselftest testcases. User could call it after create the kernel configuration(.config), eg: $ make kselftest-mergeconfig Signed-off-by: Bamvor Jian Zhang --- scripts/kconfig/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index d79cba4..5896092 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -126,6 +126,14 @@ PHONY += tinyconfig tinyconfig: $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config +PHONY += kselftest-mergeconfig +kselftest-mergeconfig: $(obj)/conf + $(if $(wildcard $(srctree)/.config),, $(error No .config exists, config your kernel first!)) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ + -m -O $(objtree) $(srctree)/.config \ + $(srctree)/tools/testing/selftests/*/config + +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig + # Help text used by make help help: @echo ' config - Update current config utilising a line-oriented program' @@ -151,6 +159,7 @@ help: @echo ' kvmconfig - Enable additional options for kvm guest kernel support' @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' @echo ' tinyconfig - Configure the tiniest possible kernel' + @echo ' kselftest-mergeconfig - Merge all the config dependencies of kselftest to .config' # lxdialog stuff check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/