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 748622DF571; Mon, 5 May 2025 22:58:46 +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=1746485926; cv=none; b=SRpmblOpCshjodSjdpizLbQiiq6DZ7c1UYy/cFj6+maNDqeEalEI2atUwqYPY8k3exvv9WrfIhpdQuw5bKsJDCkG/a43LFyZxbic/pPSfvt+0G5wrwqodaQ6E3WXKkojFTD1gexA+Wh1wBV/nh3DJ36uSOPwKGHCuIqtNLj67rA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485926; c=relaxed/simple; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ePpdLKaa0L8Jdg6jjXCrFpILZlmHVEhpcQAps4Cqdzw/lvWiBPlT0BFadNyy+R4NLh/O2aYtOyWe7AfGfeBVyfsFnQaLkqFv8xxkkKQErm+YDFQI7XE61fMGjEgrSTawam0WODP1trwT704G8oB0Qnm8/uKNso+P+y6lgwN2uhk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ec0V85eV; 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="Ec0V85eV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4C9FC4CEE4; Mon, 5 May 2025 22:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485926; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ec0V85eVWLN+/DMbtOpznL6BP/QY/0/fsyXEI1VjloqixbeoZu5DnEQAfbbmxImz/ vVYsHZ3J2qVi+NTnj9WdoZYpxCjkSW5BtX6K2EWZ4wfUxc+Ui/9wY/MYeEtVKxHdaj faDIpFJdasuWlsiY4noZKVCK2FYiuN5BpeUJkds/ueS+Ut7qz0FDtkjV68xTLRXi8d JVn4blWZMc9F6rmlxC4C2xVOXMzbUJ+zGh6BfhNu1c2+Iei9nKVwxGlaIHTMUhrY/A 7r6ToxHJ0I+1ODg8zvDmJXaa/YSY8EY/CyiJ47je7TOT7HDr7u3z7Q+lkgQZsshWC/ 9YA3PxusFVd+w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Seyediman Seyedarab , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 6.6 069/294] kbuild: fix argument parsing in scripts/config Date: Mon, 5 May 2025 18:52:49 -0400 Message-Id: <20250505225634.2688578-69-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-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.6.89 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