From patchwork Sun Jan 14 08:13:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: xtex X-Patchwork-Id: 187949 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1101796dyc; Sun, 14 Jan 2024 00:15:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IFN2aq9Ji9uxxXomRetZLgZnNcGmRgdyxAIbX8dKDJ3ttdo5Yml2JgHkggtbbKofA2LQji5 X-Received: by 2002:a92:c8d0:0:b0:360:a43d:6a43 with SMTP id c16-20020a92c8d0000000b00360a43d6a43mr4857369ilq.19.1705220101063; Sun, 14 Jan 2024 00:15:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705220101; cv=none; d=google.com; s=arc-20160816; b=siQ4CMJ+xmT+hBDEXPWvmR31LLz8VqS6chCwna6bBQR1YNmcYl/ij6RN+xl6AT4IWh 7ueJBFDDsTqfbVvz2FWBEs9c25ORuHdUVJaj58Oc09wg6KKKw8JQvPF7QvFvS0Xt7MSx PBQiUd+arEOpPGgSdG4MpZDq0CvdCrTSbAL2zNew984Lqk841pBPubZYMnfmYu8rWIHl 9kW0MbG3jJNm64M1rNH2nV92B613lZwkpsEsQy1XizACth7ynhbyZMM5/TIthdU+VjAn beyd9DMj6wqB4bCNmFnpEaPkHfpgTLXyEYwJaGzYtH4gvoGbvFLEizdCQLAEHi2H4j+t +rdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=lZ5hHvBKyu37fI6reraXZf4MZHBd00kMbGtcCThfZSs=; fh=1kO9eq5ZFx0C+jI0GrP2OGUmS21ICRLKN3pqtfzN8yw=; b=CJs9ZWmTrSkIM/9kV5X+OeaUZ4D6g+5CgLbbwA5vcskNVWOQBmGx3Z29yuC8eAgRtu oRzWWiqlaMMeg/akgfwm1YJz7qafdqUfqwXDUKGVG7drBGXThVAplOOzxrW7n2le780E aAk31e9CnUuQYNKDMGzqSoliPoUojhwtBQm40jLGc/Kl+st3F3pTMqFRIVH5gJSmn9lS Nlq9w2ozV8CU//VPB1b4ojow/KRGSTNjc1vwPXq+Ysb36qam3fg0A7K8WhtnAAXrD0S6 xNLveTQ30Et0vwC7gzGqGBokCcPdBaaTxPkn2OQmoCNE7d1uetUMPjmb/mgIaEcAd0yl FfWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@envs.net header.s=modoboa header.b=aEml6NKH; spf=pass (google.com: domain of linux-kernel+bounces-25418-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25418-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=envs.net Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id kp12-20020a170903280c00b001cf68d3e90csi6623299plb.98.2024.01.14.00.15.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 00:15:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25418-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@envs.net header.s=modoboa header.b=aEml6NKH; spf=pass (google.com: domain of linux-kernel+bounces-25418-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25418-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=envs.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id CF70C282E5D for ; Sun, 14 Jan 2024 08:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4F45257A; Sun, 14 Jan 2024 08:14:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=envs.net header.i=@envs.net header.b="aEml6NKH" Received: from mail.envs.net (mail.envs.net [5.199.136.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B58801866; Sun, 14 Jan 2024 08:14:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=envs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=envs.net Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id EE04E38A05BF; Sun, 14 Jan 2024 08:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1705220068; bh=lZ5hHvBKyu37fI6reraXZf4MZHBd00kMbGtcCThfZSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aEml6NKHlCx1geYs/mJXyEf9ofqTDH9o4PcSwW8HeZNCIbC+x3rZUZf3e9nT8Q6rX 0q7fQTyYzK5KID0+Tc1rHFbzQJrsAuT3DtwyRTVMz0YHc20M84Ycqor8a16FpGvXVF OUBArbI6uYCoOmIsUXTAfKvoGx0qz7MJNq1XbzjdqPXB/EGi7BuAF/eRgtdSsabC1T rtitBxR91Se6OY1rA+piJtUfyI6VQR66XljS8Rb7hOuMjmb6DZNkrvXQT1wTxrZUxE D2nJ/QmvTNQimIZ53T7LZ9cBKcP950PlSADSj8yjbNlsw8/hi1UfTQBFtgW2IZ8mGI CChH0SXq8FoozCwXJvrhmsvwyBW8Bi9O5fj/n95UUs2G3vjM0R0ETJX1rWdzPtZSpg z4lT99lzm6jQzOLnjqajA6X0P3EaGSEvodxMs50ro2C20pLrTLYEoIyKZnk7OpPuMq Y0FK/fTEMOD0BPagOSeOBRWLVDqfDt5y4wbc07sBTP66RDcToXHuG2sa3C2LRCsKL0 RncyqY61yuYhWZ/itsrBjIdux1AZwg8N3JiyCS/tAWOg/ZUtmEEAW71G1sYjGRoqLw sI1FDmyX8+U0PFD8k/JnTY1PgVvbjmRqultKQNkP1iwaAwDpvExeusMQ88/5CGV1V6 npK1JpMfGwrjAEevX+EVow2k= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id YBM1NF2qmNFu; Sun, 14 Jan 2024 08:14:25 +0000 (UTC) Received: from xtexx.eu.org (unknown [120.230.214.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 14 Jan 2024 08:14:24 +0000 (UTC) From: Zhang Bingwu To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Zhang Bingwu Subject: [PATCH v2 1/2] kbuild: defconf: use SRCARCH to find merged configs Date: Sun, 14 Jan 2024 16:13:59 +0800 Message-ID: <20240114081400.12452-2-xtex@envs.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240114081400.12452-1-xtex@envs.net> References: <20240113001135.7781-1-xtex@envs.net> <20240114081400.12452-1-xtex@envs.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788052872672846123 X-GMAIL-MSGID: 1788052872672846123 From: Zhang Bingwu For some ARCH values, SRCARCH, which should be used for finding arch/ subdirectory, is different from ARCH. Signed-off-by: Zhang Bingwu --- scripts/Makefile.defconf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf index ab271b205..226ea3df3 100644 --- a/scripts/Makefile.defconf +++ b/scripts/Makefile.defconf @@ -9,8 +9,8 @@ # Input config fragments without '.config' suffix define merge_into_defconfig $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \ - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) + -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef @@ -23,7 +23,7 @@ endef # Input config fragments without '.config' suffix define merge_into_defconfig_override $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \ - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) + -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef From patchwork Sun Jan 14 08:14:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: xtex X-Patchwork-Id: 187950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1101861dyc; Sun, 14 Jan 2024 00:15:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHRIGeL4+pjC/Nx555p7Yd7vwhCUgOigpPaYI9L6uFxz+UeE9Ji6WQjv2bzbFFShHWN/OKA X-Received: by 2002:a17:907:d381:b0:a2d:b935:6311 with SMTP id vh1-20020a170907d38100b00a2db9356311mr16864ejc.0.1705220114868; Sun, 14 Jan 2024 00:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705220114; cv=none; d=google.com; s=arc-20160816; b=kkYEPRXlll/L+NnTBPBCQ8pzb4MmbFU6dmrlA44LbXD+eLybD60YG8t1K7NMiMMHvV EmqO5y6Zmxjs86y+5aU7HETmkGaCGw5r22NMPzlRSrpIHRsZENJ96stprwhAlAN1AA1Q dB7dpEfL/k4ATcFhumvQQxAmdUgqurha8QS3dDKNHQZ8nGU/zYnOnjYr6nihbCa227ba 8QhVSNK2+ctpK6plRgZwZxjCfOixacEB7eonmKE1H3hBUca3fYhDPsnohH0DjFNMk7Ol CFnSFLMBamaop3h9EAdlq+qA4kzBLsgFEyha+fRq+I+4TXCXY84a91eUrUQ7tPggNCtv kXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Rmzy1x+mMdFJmxVODKg4KIE69NMRMaiDq+QZxWJb4mk=; fh=1kO9eq5ZFx0C+jI0GrP2OGUmS21ICRLKN3pqtfzN8yw=; b=lUVhiU4pDnWsvy8M2vNlpZ4chiy1hom6BXXcoh8tsAtNpOoPQR78pNv6kHJsc4arN3 1+CYjtY7GqmcyfwgrpM1f3HWQpRlqKhNVhAzCfYboIMgBs9MvWmDpkDGv8l1sC48NZat FeC+cAtQXnOKvRQOaNYdQqIkTBYNXdYfpfuDACNf8K9tmyjTCxlnOV60JHeoycLZZ1tM 9JErkrd6TPWhbiIbxN1FW+M4d13cJM1dqqOo5kjc12lntJcH9FTTm19PORRQ6gE5GOHk pYTsyiFhW3PO3w2tlWVZtAu2PNqj6MRNQDMkJ+BEZ8jeFnIKAmrLwXEL0rIudOz6R8Ky Z7Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@envs.net header.s=modoboa header.b=gtlWSyFg; spf=pass (google.com: domain of linux-kernel+bounces-25419-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25419-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=envs.net Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ot1-20020a170906ccc100b00a27d6806c6csi2829174ejb.851.2024.01.14.00.15.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 00:15:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25419-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@envs.net header.s=modoboa header.b=gtlWSyFg; spf=pass (google.com: domain of linux-kernel+bounces-25419-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25419-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=envs.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 7B8101F21E14 for ; Sun, 14 Jan 2024 08:15:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 81FDF3C3F; Sun, 14 Jan 2024 08:14:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=envs.net header.i=@envs.net header.b="gtlWSyFg" Received: from mail.envs.net (mail.envs.net [5.199.136.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84BED1FDA; Sun, 14 Jan 2024 08:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=envs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=envs.net Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7FB8138A05D5; Sun, 14 Jan 2024 08:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1705220072; bh=Rmzy1x+mMdFJmxVODKg4KIE69NMRMaiDq+QZxWJb4mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gtlWSyFg9LeO0Y7Vwfvw0BsNxp36ffBwrtBw9p+PyHgRfIVujsCSN+k7gizo9kwS/ DSG3T5/VbzdbkCq4t3N/k8O9mW5aWRi1QbFakpsZDxBMvV01hZcTa04Ar7fTIp7Ez5 aYvLBBj/nuuhlf3sbeZEHVI6oAKo5cSNSk9+0vgicr8Wn4IrMLRhn5/MizdiH1f7tb JyeC9WwadaeJXGhz0NmMpcpXcqyxojaXf9np07OQ3nT22c1ACwyghnnTE/hizxSTuE EEsOuBJ+YG5lGTmEZ1R1CFW/MRxqlOlaEdUbcftZx2uG+1GZNCEezgxyCBfqTQ0Hr+ kVLKqQLtm1A2PLbu2GFerI9ggbZwGwwJhz/vQWwJ7c72rLCki0M6fOxiZ76IbQkAhY 68ViuhsqGvCYKPsUuWEseYjIuqocYJn2n4cPbzfU5GDqNHfSLj849ktnyBS6caJt1I N3GCrL5RP7QrZwqtl7EOgeqgGgiJxLg6pFZ9O+EWyK13ahaJuas3JXI5EBIiouCYIi h2L4coJnynvLZjFj8hHpqEQBDzEY3UJ3y+6npOnqczLkpz0kCtXYazBw+tFH2V0FFV OIC6GIa4N7m8+MKCFdb8hWEUJhMGcm+Vm9/F3QRuHitJK1hUBjyjjmhzkfqLI7tTyz HRQnOwHjEk+oarQJpl9FMejc= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hLczUb6rZvRM; Sun, 14 Jan 2024 08:14:29 +0000 (UTC) Received: from xtexx.eu.org (unknown [120.230.214.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 14 Jan 2024 08:14:29 +0000 (UTC) From: Zhang Bingwu To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Zhang Bingwu Subject: [PATCH v2 2/2] kbuild: find kernel/configs/ for merged fragments Date: Sun, 14 Jan 2024 16:14:00 +0800 Message-ID: <20240114081400.12452-3-xtex@envs.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240114081400.12452-1-xtex@envs.net> References: <20240113001135.7781-1-xtex@envs.net> <20240114081400.12452-1-xtex@envs.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788052887166687868 X-GMAIL-MSGID: 1788052887166687868 From: Zhang Bingwu kernel/configs consists of several arch-independent config fragments, which should also be searched for by merge_into_defconfig. When using 'make xxx_defconfig xxx.config' to merge fragments, scripts/kconfig/Makefile also searches kernel/configs/*.config for fragments. This behaviour should also be in merge_into_defconfig. Signed-off-by: Zhang Bingwu --- scripts/Makefile.defconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf index 226ea3df3..777be9bf7 100644 --- a/scripts/Makefile.defconf +++ b/scripts/Makefile.defconf @@ -10,7 +10,7 @@ define merge_into_defconfig $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ - $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) + $(foreach config,$(2),$(wildcard $(srctree)/kernel/configs/$(config).config $(srctree)/arch/$(SRCARCH)/configs/$(config).config)) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef @@ -24,6 +24,6 @@ endef define merge_into_defconfig_override $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ - $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) + $(foreach config,$(2),$(wildcard $(srctree)/kernel/configs/$(config).config $(srctree)/arch/$(SRCARCH)/configs/$(config).config)) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef