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 18357221299; Mon, 2 Jun 2025 14:33:19 +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=1748874799; cv=none; b=c58eKgDN9ArQDB6nS6OX+1LqSd36ffkM7VQy5OwcKMqMjGXngLqr7GbQOz4Q5d8rQYrlscLQwEvojohvt/W1yu/wf38/OMwX594tDRz+Ag7jZy0Xr43tLUX2P3fXkAqxl+nCcrvPme4gpH91VE6bhrdqJFZUgTmWmDh6PXJZdE4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874799; c=relaxed/simple; bh=SFvme3YMe4ZbYgjwrYAtE3UhM+sk8lf6OyusoooOUN8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A6IzwUgxbyOpsy/XEgCjWDFOheqah/h9njz+FyPrWQv43AZojRGt1On5u9fi2XLh1Cs6txJzIwi5tj0zp3TUlz7Cr0xiqNzCOxvCTTykQpvfT0rUkIPx0EHsGDsXPRIHWFpMM1thVqTAcyHy8AJdXnfYsJ/tR+wfinTTyGTMoss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KkcIpqeN; 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="KkcIpqeN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91F8FC4CEEB; Mon, 2 Jun 2025 14:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748874799; bh=SFvme3YMe4ZbYgjwrYAtE3UhM+sk8lf6OyusoooOUN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KkcIpqeNdtpaevK518sH1arOo068I8/SdUxnp1je9yj15i2MHGx5GcKdthor5Ubbk DyKnD+sAQOBq5GmGPfNYm7+TKNGoBUXZVyV851AFoMojm2eFVN2jPGYsDrb+OJTFor 2Ja1GyA0eLqoLr9YfJbxz1DuGf64JWluWYGK79E8= 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 5.4 108/204] kbuild: fix argument parsing in scripts/config Date: Mon, 2 Jun 2025 15:47:21 +0200 Message-ID: <20250602134259.907757838@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134255.449974357@linuxfoundation.org> References: <20250602134255.449974357@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-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 8c8d7c3d7accc..330bef88fd5ef 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