From patchwork Sun Oct 28 12:55:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 10658589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7640813A4 for ; Sun, 28 Oct 2018 12:55:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5929928387 for ; Sun, 28 Oct 2018 12:55:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CAB128505; Sun, 28 Oct 2018 12:55:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E8AF28387 for ; Sun, 28 Oct 2018 12:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726548AbeJ1Vjz (ORCPT ); Sun, 28 Oct 2018 17:39:55 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43993 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbeJ1Vjy (ORCPT ); Sun, 28 Oct 2018 17:39:54 -0400 Received: by mail-wr1-f68.google.com with SMTP id t10-v6so5729890wrn.10 for ; Sun, 28 Oct 2018 05:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M+sPbjsVaVo5kMM+WbGiHZPAmbkUWYSVaZMaLAiXDto=; b=Absrz8jVlLILQIxIuedlYdQDsdJI6FUXSTGiLipuYGTdn5kMbPkgqnlhpqnfwRiFy5 TOr5DLONBIxRi++5YEIc3FgW9ekhUozCqybxp54SH+B33utJEviQq6btfjmvtzLwsElc ZsIgDz6BcM7nL9DepTd+gCN5PEvkpJLusWHIyrX/UmjNiAClSXHvRUj/T75uvzgpLd9J Avk/M+feal4BnozmHP6ec8LLxrX+usb9SosQ6rIM+pfCs8h8MbvrIvGcKxEzK9PXgOz0 LHQDmp2bNZVu0YdPjtrmTEHjZ5duOFDzqYFVtUegohkkS/616DIgv+8SZG+OIF96fAQq 7NPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M+sPbjsVaVo5kMM+WbGiHZPAmbkUWYSVaZMaLAiXDto=; b=auVYSDP4Uy8BxO9XWpt+0r3CJUXLlReaPTcvBPdihnuctKuaxNoBAVZ7SdHdQ61u8n fDsxK5AeTkEJYnDst2KgmBspqdXHsH5ih0wjo7EibvwcZl1PWbOtrRL2sqbSuj50x4VZ qMuM8prOf/lkCNsbhVk5HlTfvxuERvodM9ljiCWAKmUnIhAR1pOwSEIxnvKgMgp8do9N a8SkdWqlJkcdrC9IirkbtKVIBCzYOKp2H2KQOqqFgNr5nz7F8pumRjQzW0CwQJrN6MD5 TrSpLEWiyog0SrMkv0OKk0CazHV6SesNm+DdOoAcWcul6wDLNGQrmqsVUIw4yZ/RG4DL EK3w== X-Gm-Message-State: AGRZ1gIuxumkuhe1ze+r02b+MZzo3b2Cx6g5mKGQfd4iVMnVnxa/H5yd /7h1AybvVdXk9CeFCC5pvgE8vfHD X-Google-Smtp-Source: AJdET5e6fOQlAxZKDDId8sdJJbEc558MNOxxEC1r1pFOgW6teL2CYjNoK4/ankkxO18EQklCsgSWgw== X-Received: by 2002:adf:c404:: with SMTP id v4-v6mr12258736wrf.20.1540731318000; Sun, 28 Oct 2018 05:55:18 -0700 (PDT) Received: from localhost.localdomain ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id c184-v6sm6937054wma.15.2018.10.28.05.55.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:55:16 -0700 (PDT) From: Petr Vorel To: linux-kbuild@vger.kernel.org Cc: Petr Vorel , Masahiro Yamada , Marcel Patzlaff , Nasser Afshin , Angelo Compagnucci , Arnout Vandecappelle , Matthew Weber , John Stultz Subject: [PATCH 1/1] merge_config.sh: Replace prefix CONFIG_ with any prefix Date: Sun, 28 Oct 2018 13:55:10 +0100 Message-Id: <20181028125510.9346-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP merge_config.sh expect prefix from kernel: CONFIG_. There some other projects using kconfig with different prefixes (e.g. buildroot: BR2_ prefix). While there could be some option to specify config prefix [1] [2], IMHO it's better to not specify prefix (expect just any prefix). [1] http://patchwork.ozlabs.org/patch/824051/ [2] https://patchwork.ozlabs.org/patch/988890/ Signed-off-by: Petr Vorel Suggested-by: Marcel Patzlaff Reviewed-by: Petr Vorel --- NOTE: I deliberately left prefix CONFIG_ in comment: # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set Kind regards, Petr --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 67d131447631..538222848bcf 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -99,7 +99,7 @@ if [ ! -r "$INITFILE" ]; then fi MERGE_LIST=$* -SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" +SED_CONFIG_EXP="s/^\(# \)\{0,1\}\([A-Z0-9_]\+_[a-zA-Z0-9_]*\)[= ].*/\2/p" TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) echo "Using $INITFILE as base"