From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 497022C1E04; Mon, 5 May 2025 22:20:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483610; cv=none; b=Fl+4G84KdEihdQcKJlxpFIteo8X5xE6zDzFs674JpZ3WIJeNl8fwemM5rRHmZs7Q9cCoLd6tajoHcnPKElqxDAQHqdp4zZufqDEEmvjpHAWO4v5RTGpKixC9OiFadoCw6HXDCaso3iqPPGW6O+RbLircOAPZsLoTIvbc818ml5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483610; c=relaxed/simple; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t2L3n+p3a7515CvaAq2rnyzgBv+oeUjwWyPld2AKshvq/JANlBhBWwHi+NKMRHdhHvwe+e8NdrUy4SRZBvwd/X4VBcHfhN/d1v0dNbhitW2selXfFRw0I5tDqhm/RbKx1wEod482UqTplbQ9+2V8H6FopR/+fZf+O7vq+MUbiS4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NKo9ySXX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NKo9ySXX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81D2EC4CEE4; Mon, 5 May 2025 22:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483610; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NKo9ySXX2I6CCzq5zjqW6uqgoY5lkixPxMB8B82F8PMb+4DlYmM4rN4fZ+C9RZ1pP V75j3f6L4WH2MiaWRMe3GQZlShj1tKeRra9IYsP8rO/O9sFywJkO9qFJAT9hHt/Ic2 M80mKgJWovG9/zlPQE83BSzd8kXYSsLHnr/2kUlm+MqM7gQaEIyHDhlDwig5posewN 0fgh80IxZsCU7QWbtfOPsG/l05I/KgUapkh/9nkRiSbYRt2xv5QKF9/ytMicKN78qQ s6TSqmobiJ4rTq5/qnSG0nbqg27oxUqVZEI7gCyl+59kqieGsDIeUv2Rwtba0Tg9zr VexawXK1qa8Bw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Seyediman Seyedarab , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 6.14 141/642] kbuild: fix argument parsing in scripts/config Date: Mon, 5 May 2025 18:05:57 -0400 Message-Id: <20250505221419.2672473-141-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Seyediman Seyedarab [ Upstream commit f757f6011c92b5a01db742c39149bed9e526478f ] The script previously assumed --file was always the first argument, which caused issues when it appeared later. This patch updates the parsing logic to scan all arguments to find --file, sets the config file correctly, and resets the argument list with the remaining commands. It also fixes --refresh to respect --file by passing KCONFIG_CONFIG=$FN to make oldconfig. Signed-off-by: Seyediman Seyedarab Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/config | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/config b/scripts/config index ff88e2faefd35..ea475c07de283 100755 --- a/scripts/config +++ b/scripts/config @@ -32,6 +32,7 @@ commands: Disable option directly after other option --module-after|-M beforeopt option Turn option into module directly after other option + --refresh Refresh the config using old settings commands can be repeated multiple times @@ -124,16 +125,22 @@ undef_var() { txt_delete "^# $name is not set" "$FN" } -if [ "$1" = "--file" ]; then - FN="$2" - if [ "$FN" = "" ] ; then - usage +FN=.config +CMDS=() +while [[ $# -gt 0 ]]; do + if [ "$1" = "--file" ]; then + if [ "$2" = "" ]; then + usage + fi + FN="$2" + shift 2 + else + CMDS+=("$1") + shift fi - shift 2 -else - FN=.config -fi +done +set -- "${CMDS[@]}" if [ "$1" = "" ] ; then usage fi @@ -217,9 +224,8 @@ while [ "$1" != "" ] ; do set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A" ;; - # undocumented because it ignores --file (fixme) --refresh) - yes "" | make oldconfig + yes "" | make oldconfig KCONFIG_CONFIG=$FN ;; *) -- 2.39.5