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 ABF1C29953B; Mon, 5 May 2025 22:43:09 +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=1746484990; cv=none; b=hhsBmHCSVsGQ0FjKkUFQGipe4SEhmkZl3PwF6Ddgivc2DEf5As2TA4wbMKgF5iZV8RfULlaRXgWWYVJQFHD5Ynn+06dgXpts1UtM8MJX99Y9TdEXX0+w+hmUWmGv65p2DG/je+4m3GViGyfXPF/q1DOSb3SRPsXKBXugd6A4mU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484990; c=relaxed/simple; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K4yIxpC+A3fzztAHXpx8hp6NzcGJyF/x7umj7CuKFtmCGSPouv/4uEYAHB9hTWkh8SZ8Du7UjwTGhvR6Q+Ldzg88ImkLBjPP3kLPg2iJDsCO8EQzh422sMiaoU9Qeli4wrnmksX2gij9b0W+LAo06NOOomOUx7g4PjIUD+rAQcE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LrMfkufh; 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="LrMfkufh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7933BC4CEE4; Mon, 5 May 2025 22:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484989; bh=PnKYlJycEJNsBqUYVwar69zrMIukgXwAyTqvk8IyVXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LrMfkufh0O1vDudYNidSViGehuzhaAjpzTZBzMzyaGBKs3tYeRJrYIlytNKGuJPq8 DM8vhVs14hWQVGT2yWozptkShH/YMwAFP2uHWOazimrX2fv/Tefn/0CgJovLI924RE n5ZWH/Ip7Wwzw4O4QHjSZGbBZr2XGR9liMy2ONsBuakQsUY4gmLv0ME8Iojkx/PqRr ny3Lvpx1QrpARpyuTj1ZbBPPqQ9uuBwS7jCzlJ1Hd1yAsh+zztWeHgxKF/YM/7Vjc3 XdwJwQ0u/lcKN7B3T0wgdOPDCmF494HBz4WGaY5/eC2yUBgBrTYp4ND04QhsRDkcRH 0yhaW293hVXcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Seyediman Seyedarab , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 6.12 112/486] kbuild: fix argument parsing in scripts/config Date: Mon, 5 May 2025 18:33:08 -0400 Message-Id: <20250505223922.2682012-112-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.12.26 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