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 6651427FD53; Tue, 27 May 2025 16:53:53 +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=1748364834; cv=none; b=IZoXwdSyhVHldiPwqxP0eZ+SI/VKTNncVX0Qurq17kmRwEt+PigcY6tDPp8/2q6dQy7gE2Yaxw9DjMxppv5b8MLs2rNg9wYOXFoCd4OThy5yMXpjF7WppnWKNTHmZqAt9sYf7yp/wPnGaA+zubJeL0BWqiQF1WmMISTY64kjyiU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364834; c=relaxed/simple; bh=Z7G+cjR0bj4mqvK6LaIwH9kcaXwzqvIkKeClEq+GvK4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sj4kf096H7WTFQIyiDftn5z0Og+5E7MqhIPr8Jb9WhgVijjUyuwM8p97LtTxmtdpYdgYQl/e5K51hT6LkJ3ZPKvL9yYu+E+684RySqCYxWQ5p4GkAZvp3jKMIevnrWq82AxO6pkEzDnonoGKaOO0cleQ9HJ0IhUQkoncYvdgC7A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W2y3BTa7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="W2y3BTa7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A98EC4CEE9; Tue, 27 May 2025 16:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748364832; bh=Z7G+cjR0bj4mqvK6LaIwH9kcaXwzqvIkKeClEq+GvK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W2y3BTa722EdMPWrOnDj7FfrynFwVmeUmLicn15+VctYW8U02nQgnVh3h2nMnyAWL N35ZhrWWaB3g7C6cKEHyARLdhM9epdkOF0Yq1+ZUI2MP69Z15fz7azdBxl5iiEt1Mx mFMEoG9ts6p9dJihWfrMjsNFQRSUSEJtD+HfDjXo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Seyediman Seyedarab , Masahiro Yamada , Sasha Levin Subject: [PATCH 6.12 150/626] kbuild: fix argument parsing in scripts/config Date: Tue, 27 May 2025 18:20:43 +0200 Message-ID: <20250527162451.123395827@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ 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