From patchwork Mon Oct 14 14:13:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835104 Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24BA419F43B; Mon, 14 Oct 2024 14:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915241; cv=none; b=M+c54BjIgLTrCwc1xqd2Z+4c2noiPyxZD/0ZtsDCEiCFveArDU/uwYIW3cDzQ42NxeGJY3jkx6pwRuUkelA8hIlDUc7YnD00NrMEckHjuJSNJtHCwFMfV+CNcZ16DKvoaMuDewNrEUbQeICWLbjuUXfQyesSVJdWIEj4P6hHwMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915241; c=relaxed/simple; bh=5+B+94kuRZvyNX2qEupS3kQ/Jzgkt73OhhJnzBzzB8I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D8XpG2s94XVI1bxhvnYL87DVe7pxtgpoR/xvS0uTO65sLLu4PdWNAt6gbGeI/aKWtxdYTi3xToaJCqVHIO8l49lJNsMQrmgy3DxWpTgNtM4TTxOfFGjze1ptFu0Dm7eZq8lak5VuLTyMyOmaTtAFUy6Cy9kn9yk0g8IZr8edwJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DGOd9jaZ; arc=none smtp.client-ip=209.85.219.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DGOd9jaZ" Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-e28fe3b02ffso3615682276.3; Mon, 14 Oct 2024 07:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915239; x=1729520039; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ri0LHLGarX1BO6YHRIU6aF9lhqxJiLUP305ntwvuFnQ=; b=DGOd9jaZkn/vG0gEsH/kbE1Wfi8nbFHuwwh3uUcMxhJzOahe2oXveYn2SGbY3+x88t RCyT+gr0Q0oBQjs4BNEzbcm6zwPCvOjO7IG8LlVvB97kQjIXKqIMZSTiqnscdJlZk/+g lxNgpVD96o5J8/At10ZsgV9PQZuOiP4P78bFc96YrrgX+LOk2kqjFrZg7ahQm3XnmUx3 treo2ZSmfcL7YdKXwzkC0ZZX3hR9716Gxay2SbPVUM4jpgJRo6aes+QltfUpX+i0pcZn 3lukxx/MMWyO5QhivD76kGo20X8vi46c0iwy7mffQer/uN7MVrSKxlHzc++jhKhG29GY P26Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915239; x=1729520039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ri0LHLGarX1BO6YHRIU6aF9lhqxJiLUP305ntwvuFnQ=; b=TXZn90/IC3Em2gIpKJtwB/PvXWUWhuyHNYXeNxVKFhPMYqZELP08kZF/uMSMPV0Pqc A+/76kyHF3uK6BSJdIKrsM1M0bHe4WkHTi5Xu/M5VeKJv2cvzPlM0ccPure2yY7+Z8xM zhhEt/3xAcURizwhll3awfzWadwTWj/4pkdfl4f24kR4Uf3nWgtwTP3Mb/JC84qtYGeU a4bnTXf8pneBdmB3I+AaC5IWX89+WoTBeXdo2Ypv/Na188BVgVBUR7SHjU9Dd3/uwHKn 66tZwXIfGADb/k6jHQOv7q1A28E6t1lYF8gnZvS3/gC9BAZU+n/bBnCrrahK+xt+b3PW Hc/A== X-Forwarded-Encrypted: i=1; AJvYcCVjLyP3o+uNPn1Zvc81iEF8IvdQnJHa7IZc85WKvvBsL4IoZ70pcbKvHSIiV8lIACSqEVAbAtXounhG58o=@vger.kernel.org, AJvYcCX5SdyyxRW1HRmhuU6Qmkh3dTHI7VceA0l7LEqvBr/K4sT5JBj/huu4hqiO+XtFXTCpqzyuDFG8NwiMQ3pq@vger.kernel.org X-Gm-Message-State: AOJu0YxpnB1OEI6WktNa72QWWo4c5+0GyDwG/nkFluOWK8ShoG3vASD1 jwIzTJTwcjk0sEiEwNlsHkNlRX3olsGFS78ZTOH1jS/o7nS6YnBoqcuBVQ== X-Google-Smtp-Source: AGHT+IEl6xqHp+bxtuvuDbxs2LjhCZ6szsW3vZXr5WOk7e5246Ojkbw2gC9m1P91gq5SjFpmGKqr7A== X-Received: by 2002:a05:6902:2688:b0:e26:8e8:b29d with SMTP id 3f1490d57ef6-e2919ff46a4mr8750329276.53.1728915238978; Mon, 14 Oct 2024 07:13:58 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e290ee16d5fsm2438839276.29.2024.10.14.07.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:13:58 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 1/7] streamline_config.pl: fix missing variable operator in debug print Date: Mon, 14 Oct 2024 10:13:31 -0400 Message-ID: <20241014141345.5680-2-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Put in the dollar sign for the variable '$config'. That way, the debug message has more meaning. Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-3-david.hunter.linux@gmail.com/ V2 - changed the subject --- scripts/kconfig/streamline_config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index d51cd7ac15d2..a85d6a3108a1 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -503,7 +503,7 @@ sub parse_config_selects # Check if something other than a module selects this config if (defined($orig_configs{$conf}) && $orig_configs{$conf} ne "m") { - dprint "$conf (non module) selects config, we are good\n"; + dprint "$conf (non module) selects $config, we are good\n"; # we are good with this return; } From patchwork Mon Oct 14 14:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835105 Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 369E71AAE09; Mon, 14 Oct 2024 14:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915242; cv=none; b=AEX1T/MBfmhX7ea83KY98VIXYpDAyfEvway8nqZZoTlA8HBkXIHo+aeZ2XdbxzVkZqc/PD+LN033vvo0H5wf5GS1jmx5xAamk0KY+bhdJLQ56jMga+KNrzJZ2iK6t+s0QxAP/W4+dDjMJeGh4yrHGhHjiiGL5lzMK1k2IsPbBAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915242; c=relaxed/simple; bh=U9CBDFdubCjeP4chXsqTbx6AelMOMWpOu8+4dkQNBKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7gDR4NLQmUT4t/eks+hEmf4HJZ7SIxir9A1hctTk4WLE/O9PnPxRnA6rTmQRNRmuHSU1MIXB8FqfxuzMH1I7eDJdxp63RKt5Gq9cXEA/z83c2odnzzURcgh/br4UZ0Oxfu1xGvON8Qm+Eq9BCjoLV9OQrMg4pEDRsr8dc1/iWU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VfnDdsLV; arc=none smtp.client-ip=209.85.219.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VfnDdsLV" Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-e290200a560so3719696276.1; Mon, 14 Oct 2024 07:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915240; x=1729520040; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eM1QK7QxtM8b4HCQgjUKLYH0v5Y2AcqxtZU/di2qGfc=; b=VfnDdsLVXyVpJxXGtEjydSGkb+85sk0PjdR9BsTZpy6xh+zFwsSQhHMJcFzMgpFC07 cijNTwOWyICq9I5grTKWRfrjoZ8/b1q3NjUqBO4EvV4a5N6fl7ZtXjuu6HKzS27Zg8kT tZHEoQOUkgpqA2Om1LW2LRF8LtpqkfZMj2kMJIc1YJmd00H/zW+aFeKKC2Lc8l1p0k2M +2CW2Scvvk/5Rk4M/Hqlsk4TcN9HJCgad+1EtWoJg0hzUfOlVNrb87YH6Ptj+4dUHjMC ki+UGHHL2msPKn/7sUh6E/OWPUkw3pKMgRGn3ODvWoeM0MMmauTJ6X5jXUChPiPRhHCQ hm9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915240; x=1729520040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eM1QK7QxtM8b4HCQgjUKLYH0v5Y2AcqxtZU/di2qGfc=; b=YyGxVULMUcEBnEq8FFWCbfoLAj4rajacKwhTTZAsB6mtr72IXBPV0wJq42LsHrvMBF nK//PKtI0MyNxjg6lOT4M4fkAJ2Yr6C2ftkbs9K4sq1ZAq5XjLC5DTcZ6deCcqfTXGFr 3LfNORUbLJXypL6RYqjEbKMGhtihhRse3wHiC9z5MKKaV38/bqdp9DAMOQOT2iwKWkHC /kMsRSg7hyLJQNTJXxLwRHN84WyYKiHGgBVvCrpfCTl6A0kbwTFeMMBjdkRdVyrv4HKb gwq3y2uNlYqjduk+XSE9i2xkmppuSytb6vMSU3HnBHfNmqtYWvxQpzR2vjpJTLrn1JDG 8/qw== X-Forwarded-Encrypted: i=1; AJvYcCW4SMdEZBtXEI3hTIEc5+757FBGfBwiL3VhC7n+bkzW0QKIF+0qX2f878HEdMoIjiUBDjVaYwK/RoQpTLw=@vger.kernel.org, AJvYcCWO3Gk/yeC++5WC6l5HJwOvOHpz0aG63zo1r0ztofFSVTNZOaI1CqxClHPNkdpHypEkJ1ygQC695nJKUB8z@vger.kernel.org X-Gm-Message-State: AOJu0YwWhtuXK3xrE9tflCUm3MbzHS6qlA1HSTB4RQNzngc/PjQod27Y sBtyffloGfcqE5gQjydfL4brXFgDSS2DAlTmUHsDZ+hhOLAjj863 X-Google-Smtp-Source: AGHT+IESuJBpD8xDBGGQM4qOMYv8Pv6xy81i0m0rCP+RlWz7iuTdAeYMjKIqOgdbGJknMhoo9wFD3A== X-Received: by 2002:a05:6902:218f:b0:e28:6b10:51b4 with SMTP id 3f1490d57ef6-e2931bd708cmr4822361276.46.1728915240177; Mon, 14 Oct 2024 07:14:00 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e290ef7a00bsm2440552276.53.2024.10.14.07.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:13:59 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 2/7] streamline_config.pl: ensure all defaults are tracked Date: Mon, 14 Oct 2024 10:13:32 -0400 Message-ID: <20241014141345.5680-3-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Track default options on the second line. On the second line of some config entries, default and depndency options sometimes appear. In those instances, the state will be "NEW" and not "DEP". Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-4-david.hunter.linux@gmail.com/ V2 - changed the subject - changed the condition to be more in line with the script style --- scripts/kconfig/streamline_config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index a85d6a3108a1..85f4712e2bf3 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -220,7 +220,7 @@ sub read_kconfig { $depends{$config} = $1; } elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) { $depends{$config} .= " " . $1; - } elsif ($state eq "DEP" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) { + } elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) { my $dep = $3; if ($dep !~ /^\s*(y|m|n)\s*$/) { $dep =~ s/.*\sif\s+//; From patchwork Mon Oct 14 14:13:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835106 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68CAF1AB512; Mon, 14 Oct 2024 14:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915243; cv=none; b=DNuwMFaWgxO8v11WC4UINlKEGI7l0SBKeYPHokI1H0Q0dEkAkvUip4iV8ExMfht+p4KCc7Cme0mpuJRfWGEYiOadoP/y0ZOgHJSEUIArMZE1QzPHl4a7JXybvCJ3+bGbRFTuHqUJPEsLNWT7MVHW5EMqp+Tj8NKd3px5NFyYoyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915243; c=relaxed/simple; bh=Em1qqY3YZk5Jj0WQkWEfPE/KSBa+c4a86KbWKTTSNZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=psdAi1b/thDDzzRki0xjmOEwwt7DQ+NdAJbDopWKJrCpvs+NbAg2uuje7J6ratrfoV9lzj7vrxRYTgj5qPDD6ciqGGG3F68vaNURhEKtsqcE3HPmCBy23nB1tleD0s56Rc6sRe0etpJ5IoyePZZST79YlgE3Ztbv+SYoUkTEviA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dHl30zmo; arc=none smtp.client-ip=209.85.219.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dHl30zmo" Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-e292926104bso2154260276.0; Mon, 14 Oct 2024 07:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915241; x=1729520041; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zDGj+r4t1l+VeJOzAoFJcgus9t9arZh3YvstB1D+FOE=; b=dHl30zmoKg1duDqeuvnDRD5UROEXPc4ZTXjN2+ju5ImYweXfNQ+M0Nh03rkFMNB7lp D45K9FJbmCnnAj7ijskzNQ/MocQJhwswcny8wUKKzgCcLHypa0l+sjLmY6kQhss6MX+d sz3F0DAjquUOuvh72t0mzdTWS51yOgkD3whw2IpRcF+ea0nAlTvnnGWnxGjghoTQTymd KtB9wZytOG4E+4rPRxiHKDmoKjF9F7dK94dBuU8yBPLYwifzfxofQjU/BYWy5pZs9cxY mLoucYeruTU/ANJdOluBKAXXdgHeSOa8kIWWbUGLj5js1z+Q8txuOSDW7j/8i/PDnkM3 ICxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915241; x=1729520041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zDGj+r4t1l+VeJOzAoFJcgus9t9arZh3YvstB1D+FOE=; b=JlJffY9s3hjnoZGcjZ9hlqp6z0dq8YSJajd+5Lg8oV/OqAyya9s6VvbJJemQefugZ4 RvFWjQJWXPb9ROcYskzVgZqFr5HA2/sqGW9X4oasNtJ62b516yZ0F7TJcS84vZi3NqE4 2kBgNPgAI4gY3wrpXnVeZdjmsYLdm3XWMs53ia6OXa14usQuC6rL2Q4CR2lqGuiio8o6 9so4aMgcNDjKOtp+M03jbtcP6CqFDHVZpt9sJ6njELNmpynbx0DSDR9qtfBl/wehpHCj a+O0S4ZS64v9hTMTwc0LF2T+c7+BTRzZdOAc6s+5D6DTrwbaCwxavSmAwBaCYJIiSSYY svaQ== X-Forwarded-Encrypted: i=1; AJvYcCUh8ACtsj1qnQ9GNP8i+GWUW5iRk0sUdSUOPXeDyef0zqTLE+2YzFcdFa+2zyOCL+lKGgzQ3IpCBxZ9Z+iZ@vger.kernel.org, AJvYcCVgIjgekX2t/2YAikLPSlx2121KdolMNibX6tqzOD9vVQaQPogj1tRfzYfzad8xB2tUJQ/gS/tqCB52Fh0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz947bW0elUCsqL5FdT0We0PvUp88nYh3HCPNT1NG0bbO5F1yGh +4BbaHCRxWWzahu6FSsvqjhsvXY2p+RIJdKQNFZhzx1rEBEY9Z8A X-Google-Smtp-Source: AGHT+IFWNC/7vZpalbKxCBbKRBEMaJs4KTcmwhAc/Wn2YZFXXx7PxK/pRakGql6k81SGo14puZQQDQ== X-Received: by 2002:a05:690c:6bc7:b0:6c7:a120:e10f with SMTP id 00721157ae682-6e347c68d1cmr60206817b3.29.1728915241277; Mon, 14 Oct 2024 07:14:01 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6e332cade3fsm15417117b3.138.2024.10.14.07.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:14:01 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 3/7] streamline_config.pl: remove prompt warnings for configs with defaults Date: Mon, 14 Oct 2024 10:13:33 -0400 Message-ID: <20241014141345.5680-4-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Ignore process select warnings for config entries that have a default option. Some config entries have no prompt, and nothing selects them, but these config options are okay because they have a default option. Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-7-david.hunter.linux@gmail.com/ V2 - changed subject - put a space between "if" and "(" --- scripts/kconfig/streamline_config.pl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 85f4712e2bf3..8e23faab5d22 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -144,6 +144,7 @@ my %selects; my %prompts; my %objects; my %config2kfile; +my %defaults; my $var; my $iflevel = 0; my @ifdeps; @@ -222,6 +223,7 @@ sub read_kconfig { $depends{$config} .= " " . $1; } elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) { my $dep = $3; + $defaults{$config} = 1; if ($dep !~ /^\s*(y|m|n)\s*$/) { $dep =~ s/.*\sif\s+//; $depends{$config} .= " " . $dep; @@ -523,8 +525,16 @@ sub parse_config_selects # If no possible config selected this, then something happened. if (!defined($next_config)) { - print STDERR "WARNING: $config is required, but nothing in the\n"; - print STDERR " current config selects it.\n"; + + # Some config options have no prompt, and nothing selects them, but + # they stay turned on once the final checks for the configs + # are done. These configs have a default option, so turn off the + # warnings for configs with default options. + if (!defined($defaults{$config})) { + print STDERR "WARNING: $config is required, but nothing in the\n"; + print STDERR " current config selects it.\n"; + } + return; } From patchwork Mon Oct 14 14:13:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835107 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 802841ABEA1; Mon, 14 Oct 2024 14:14:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915245; cv=none; b=Nrv4hwUF3949eBcQYGj6HMcS7mD7OF0fPj2jedgCbdr+fJftgMnAPO06PoCUr5vYbbpD4eK+KVmnJj/WNNqnHqkXuCuzMs1BVzfeBhNADpvRwFfSiSKTtCm+jU830NrH5zLpvSZN5/o+g6JZJWcCI/RZDcw0GQ1Dh76Tb/ZKzwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915245; c=relaxed/simple; bh=V2TJKur96MQBAsiBAIRuq4SPj6UoJEDjYMMuC2O7z2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Db1FI64bkcADK55CUQtPZvs8l6w7pg4in3GZfKRnMTOynN23WxNCsmDT1Cs3paEprpRvXSWBBv1Y5YHcGEtmwH+Fdkg/xJmtdeEp7FIX0JEev8DUTziGlbCZhCmh4DwPW1IZkBFYJ9UwgmWZzBsxt8qGyT/P8C2cPjjLaHttbH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=evCeyza/; arc=none smtp.client-ip=209.85.219.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="evCeyza/" Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-e2908e8d45eso3574636276.2; Mon, 14 Oct 2024 07:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915242; x=1729520042; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ModGDwAVNaT898Y7/KmRR4uIfWf8h5q3e45n0nGhtz4=; b=evCeyza/iCMT9vDPNe62W4fCQDxvRa62qg+o8lP1S6SFTtZwE60YxCPks+zy/teL+Q ZX70a30Q09X6AKJPj7XWv1sWgvkEgEoF9Xmf+M6+OK34BbGe3/62HZ81WEGlE4tc2h/+ BNAXzZxqBeB3wjMfG0uobMeXnjeSX0S9Z8ToSJ+d930jPI0T2WAWMvc//kuhpVYTgz5L ElE6NIQ3YQmqZvu9GNmAxsfn68JNUDKrvBss7xNBZTy54JuKFC6ZZG9Jiyrq2FW9XAVO z8B9hFbOqAEpjmWcjIrtZ3QnDJgKGzbCH5gtVrh9CVq9DJdW06Yf86AaOryT1LJWSTAm Rtyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915242; x=1729520042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ModGDwAVNaT898Y7/KmRR4uIfWf8h5q3e45n0nGhtz4=; b=w6/xjJbdafWXWLL+qhL8V6hICyZamvHUpcgpkM3RLMaoQWcQSe7R85HJah8DjWbsJ7 GBwNuR1/FfFHpuPZ2iZ/fAHDbbYmUigxpEoRiGEAmpXozhLtygb0v/5XqZa29SjVrf+n IAZ38k+EZKRIZPrfChIyBsnRn6RMlfHrQfL651aq6+ugTEodKISK15BNsnya+lNASFPK xHVxUb7wf1QwZ2F8g8V3OB89IXSuFV9eIV35/EKpFQldLEjyyxU36rHtXiONsvlc6ATm WOP0MdKCPxCuhNU3zXMCzgWRPE8DvWJ0UA74dKSpCNeDNUsYpM5zkqZR3If/RNSK6gKE A0IQ== X-Forwarded-Encrypted: i=1; AJvYcCUz8O5MD/mSbBRrfPkDqnwcz3jHN+kErjQm6Sm9nYRbA3jheBL8w4NZXboxuvaKH/pK/FTewxPd0jjyIPU3@vger.kernel.org, AJvYcCXfxcTMX5EXX22red7Y6HvjIogbx47DISvyvjeARbEdlOj065P7UEiLwBIC/kbeWoL5uLrSDl4B4WOaYk8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8l3xkMd9SHMzX0IRiAys0f4lP5+ic1wgzXY/ysQFawiBRQOjZ YkSwT52hpYbSG6+SzIjgj6UQQRKOIOlLvOtT4N1mFCONz+RBdhmC1jG40A== X-Google-Smtp-Source: AGHT+IExOMlVqsd/HgALwQFnv+8NBWh8x67EbTyQUKO6xFYBa6JOotQB7N+5TBO8o5wO57a5Ead3Vw== X-Received: by 2002:a05:6902:f81:b0:e29:2e6b:f830 with SMTP id 3f1490d57ef6-e292e6bfad0mr6308033276.57.1728915242529; Mon, 14 Oct 2024 07:14:02 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e290ee00675sm2449601276.22.2024.10.14.07.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:14:02 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v1 4/7] streamline_config.pl: include tool to learn about a config option Date: Mon, 14 Oct 2024 10:13:34 -0400 Message-ID: <20241014141345.5680-5-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Include a debugging tool that can help developers find out about a particular config option. It can be challenging to find out what is going on behind the scenes of the script due to the vast amount of config options and the ways the config options interact with each other. Signed-off-by: David Hunter --- scripts/kconfig/streamline_config.pl | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index f5a07b3a1922..bbcd5a6e9726 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -713,4 +713,53 @@ foreach my $module (keys(%modules)) { } } +# the following tool can be used to check a particular config option. +# You can read the output if the variable "debugprint" is set to "1." +# Here is a sample way to use the tool: +# dprintvar("INET_ESP"); +# +sub dprintvar { + if ($debugprint) { + my $dconfig = $_[0]; + my $fconfig = "CONFIG_$dconfig"; + my $con_found = ""; + my $dep_found = ""; + my $def_found = ""; + my $sel_found = ""; + my $prom_found = ""; + my $ori_found = ""; + my $proc_found = ""; + + if (defined($configs{$fconfig})) { + $con_found = $configs{$fconfig}; + } + if (defined($depends{$dconfig})) { + $dep_found = $depends{$dconfig}; + } + if (defined($defaults{$dconfig})) { + $def_found = $defaults{$dconfig}; + } + if (defined($selects{$dconfig})) { + $sel_found = $selects{$dconfig}; + } + if (defined($prompts{$dconfig})) { + $prom_found = $prompts{$dconfig}; + } + if (defined($orig_configs{$fconfig})) { + $ori_found = $orig_configs{$fconfig}; + } + if (defined($process_selects{$dconfig})) { + $proc_found = $process_selects{$dconfig}; + } + + dprint "config: $dconfig\n"; + dprint "config found: $con_found\n"; + dprint "depends: $dep_found\n"; + dprint "defaults: $def_found\n"; + dprint "selects: $sel_found\n"; + dprint "prompts: $prom_found\n"; + dprint "in original config: $ori_found\n"; + dprint "process selected: $proc_found\n"; + } +} # vim: softtabstop=4 From patchwork Mon Oct 14 14:13:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835108 Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF38C1AC420; Mon, 14 Oct 2024 14:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915246; cv=none; b=hMWKYMeX1YnfN0CVovxhipVp57mMkYxd90Y059Kua7m9+iMrGKmwe1oz7zQYRDjcqnAI3kZhEmhs636R6XHGsva0FpwDiBroahwqGEGrHRortgFhIWa+IZbSbVy6KItujCyCrtcypDMcUI2gASKI4QBBCibbUW00h4HNoHmkTn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915246; c=relaxed/simple; bh=Oy+ZjNKZJycKHYpmUUCO9ZqpSRZty69I59ZUzaivuis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lYFge/sogfQq5H3d6YgG9aCfIWt1eNYEkpkCHGD0Rj9B3GWfgJuzf81eDXb1+quNBtNjIG135wlJOO6m4cERWl4uZTrc3myUri8y4z+TWaBzpxyz4oKJfqVjjYXYOfTa8NmFCbmrPkz6+YIz4fZWtbAOXRTi3ou6UQ1hp77/TbE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ERBR5poT; arc=none smtp.client-ip=209.85.128.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ERBR5poT" Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-6e20a8141c7so35005057b3.0; Mon, 14 Oct 2024 07:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915244; x=1729520044; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HbJLZsdjvPc/i2T92zlmC+SINaRjPA8nN1oxgEAP1UA=; b=ERBR5poTu0SyD/KtEDze+AyfQaiR4PAo+8FV/AIRyQgOc6USfyqZ4kJ7aaUnJlfV2H z9PhBFaLJbGJlWzwdt2pWpT5yNuKPZmACfObJSwaB6GDoDN81qHI14GWBAa0YXLEK6VC 9lZCymny9RCBc04Dzz7n2cQD3q9j7JlceqTbNZZWyxdNQZTG9pcL1DSo7tEueuprds/4 FCwqX1VaARlibonAq6/jqC1d8Xdn5OJZrfxV8FajxJEVuL0EDJJ+18R9QB5Zhf1qNCns 4nPhg6FluQNcM2Gc89kjyMoJDTPFfOaSi9Aeqtl14JiXSnt1Lt1vDEQe3lrWcPU7VRzO xzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915244; x=1729520044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HbJLZsdjvPc/i2T92zlmC+SINaRjPA8nN1oxgEAP1UA=; b=MkChk2fuqv6kSYPz96EsYmUvO6OITpgvxZNTaj3TDkha9AvVGgFTxH7xEx2gsA0hCj jqEUiU9leZXtCQnLhryu0AEz3zndizFWklbe/cXqM9S1YpBv6DrIe86Mgo7/jWHyAli8 8chsG/P9Lf2WWYRwp3wcVvLDSBTf2Oz00CP2ldOaU+Nm4z/OuBDUXTYW83D7Mp+96OYM yBOsDCv/AzECkYWjslT4Lw+cx/Q8KM5meTGFQ+4ZTJBYyNMleE943PofRCuqNlUr118z 6wQPF+ab9FX2Jbae+Y7ce5DL7n0xLXm9M9B1zDNAbosE23N5cKthPA2vIulFN+/FQ3Zy mIbg== X-Forwarded-Encrypted: i=1; AJvYcCVpMeNKDvKQvqB152rmBaSW+E3PuSkgz6ubFsdAFiTZ/0vy9S90WD9NJqFjJvc1o8UqxDFGDbBC4NRlntGz@vger.kernel.org, AJvYcCXL4R/prO0Gcyqqncq7Whppe/W0//c3/fdL2CNQysFM9IDwC6t5wZmNHCY/fY598VQCYTkTGBLfGdmHeZI=@vger.kernel.org X-Gm-Message-State: AOJu0YzxiV/zxIyuXMNx1BXmpx38Jd5DgL9LQMiDBtPPNGE1AE/HTyDh T0tfhyE5XtKVM1Nyy8OCTyohtyUOfZQ1yuCWL8XB/yqJ/e1HXoke X-Google-Smtp-Source: AGHT+IGKaHHjmKk1Lns9ucqPxOGx3HlXakTkzd3CdDzuCn1AV5H+0euu8q3mS4N/MCqdnKg8V/a/qA== X-Received: by 2002:a05:690c:56ca:b0:6e3:2aba:3503 with SMTP id 00721157ae682-6e3479c2b10mr59098257b3.21.1728915243686; Mon, 14 Oct 2024 07:14:03 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6e332cabf37sm15553787b3.129.2024.10.14.07.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:14:03 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 5/7] streamline_config.pl: fix: implement choice for kconfigs Date: Mon, 14 Oct 2024 10:13:35 -0400 Message-ID: <20241014141345.5680-6-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Properly implement the config entries that are within the choice keyword for kconfig. Currently, the script only stops the previous config entry when a choice keyword is encountered. When the keyword "choice" is encountered, do the following: - distribute the lines immediately following the "choice" keyword to each config entry inside the "choice" section. - process the config entries with the distributed lines. Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-6-david.hunter.linux@gmail.com/ V2 - changed the subject prefix - changed the method for storing and distributing the choice block. No longer using temp file. --- scripts/kconfig/streamline_config.pl | 47 ++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index b7ed79c5e070..4149c4b344db 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -149,6 +149,34 @@ my $var; my $iflevel = 0; my @ifdeps; +# distributes choice entries to different config options +sub set_hash_value { + my %htable = %{$_[0]}; + my $tmp_config = $_[1]; + my $current_config = $_[2]; + if (defined($htable{$tmp_config})) { + ${$_[0]}{$current_config} = $htable{$tmp_config}; + } +} + +# distribute choice config entries +sub copy_configs { + my $tmp_config = "TMP_CONFIG"; + my $choice_config = $_[0]; + set_hash_value (\%depends, $tmp_config, $choice_config); + set_hash_value (\%selects, $tmp_config, $choice_config); + set_hash_value (\%prompts, $tmp_config, $choice_config); + set_hash_value (\%defaults, $tmp_config, $choice_config); +} + +sub delete_temp_config { + my $tmp_config = "TMP_CONFIG"; + $depends{$tmp_config} = undef; + $selects{$tmp_config} = undef; + $prompts{$tmp_config} = undef; + $defaults{$tmp_config} = undef; +} + # prevent recursion my %read_kconfigs; @@ -163,6 +191,7 @@ sub read_kconfig { my $source = "$ksource/$kconfig"; my $last_source = ""; + my $choice_activated = 0; # Check for any environment variables used while ($source =~ /\$\((\w+)\)/ && $last_source ne $source) { @@ -205,9 +234,13 @@ sub read_kconfig { $config = $2; $config2kfile{"CONFIG_$config"} = $kconfig; + if ($choice_activated) { + copy_configs $config; + } + # Add depends for 'if' nesting for (my $i = 0; $i < $iflevel; $i++) { - if ($i) { + if (defined($depends{$config})) { $depends{$config} .= " " . $ifdeps[$i]; } else { $depends{$config} = $ifdeps[$i]; @@ -260,8 +293,18 @@ sub read_kconfig { $iflevel-- if ($iflevel); # stop on "help" and keywords that end a menu entry - } elsif (/^\s*(---)?help(---)?\s*$/ || /^(comment|choice|menu)\b/) { + } elsif (/^\s*(---)?help(---)?\s*$/ || /^(comment|menu)\b/) { $state = "NONE"; + + # for choice, distribute the lines before each config entry to + # each config entry + } elsif (/^\s*choice\b/) { + $choice_activated = 1; + $config = "TMP_CONFIG"; + $state = "NEW"; + } elsif (/^\s*endchoice/) { + delete_temp_config; + $choice_activated = 0; } } close($kinfile); From patchwork Mon Oct 14 14:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835109 Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAFF01ACDE8; Mon, 14 Oct 2024 14:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915247; cv=none; b=AaPoE16WVygmBQ03wiiq/oAclUiAmdk2PRj6bsJk4hhTqe1Z36Qekpd/SycF2Io6xOiqxDuXJtSpckTipwUpFKAtU18dn16BUgalpAfPyrVTt6VQHzusxPod4JrFoM4Z8MR2bCHc1Hd7L9D4cHxbnJR6gIDvpGQh5Vyg9UqUPAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915247; c=relaxed/simple; bh=7EsehB4TQIQznK/fwIRTcRdgmqehKGCyrgydthidHvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YOpc5l/7fyURytVJjULplxfjaaif+26ApQaVbcyslxiNh8BTzJ3a8NnIweOyH82eNLFhFKUG8UCSnF3qhJfYZBS6WPOGY+WM6A2ONE7+/+sgjHeNndAgh8PSKxPqLyeMFzfVKK/dXgNFCFFcrzABA+e87cgyZSIBrkfUJ6XyN5g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MpSmbDVC; arc=none smtp.client-ip=209.85.128.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MpSmbDVC" Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-6dbb24ee2ebso44594537b3.1; Mon, 14 Oct 2024 07:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915245; x=1729520045; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MM8ijJVXVu9oJKfrm/n4jAf4cvVmRxwxcsbBzjaYOyQ=; b=MpSmbDVCcQQsx2Fo9sbCOMwn3oD1cIcha22k4MtBup/ZIcEQonufVVeSHnHSHvKvqN iyBLSAiIupzuZia4OsuyPiF3J7fNd6NdQAwoZrlmytinJHI3zVKP9fGzUM5PPSZ1qji9 hr3/ZxplumYG+wnEfX1CFTxm6A7E5bEkbJ35Asm7AmI/3LwqdGU4dppdmvMEjbpvdE4j F9/oN3lAadGoBqCefo1n4F5x2t89TF36LDhnjcV0AYOKmyiHtPdMnA9ClZgIAb0F70UZ zpI6KjKAspkobEYBI9nQdO285dK6BCYBJHtX8ee3mDzaX7QVMQy3PsDQ97vo4yHglkZm yzDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915245; x=1729520045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MM8ijJVXVu9oJKfrm/n4jAf4cvVmRxwxcsbBzjaYOyQ=; b=va1PNFKvEKKBC7z2tGvVvvnJow1gM4ksBCAZyHL4W0+znvEjxJNcHbI7fscM3j+5QZ qjGfT1HOcu8EIgt0U1ZlxAhxaKUdxta8m97h0EDqwy5MTYydJZSifzCLDBaTxDH0wnNZ 0QytXYQnDfpHu0rjCK9SE+SMvYvpPR5J7jbEdP2EQdWu6DgKzEaOOkstLwalxDlW8vB9 oa91PlvKRgiquIMUwNwbFJ9pnF6mtCnelMxntU/gZ9/acgcuzS2LqasZKfShwBd+1mgG 8iMIBksWD0GZH5M3G2d1IIQZhggqljOrgpQjSOjxFI1Fj4FtWilzQ7ZbB5Gwz+Oi2O+F c2SQ== X-Forwarded-Encrypted: i=1; AJvYcCVJqBD1n95nt0M9FXqXTfZ1BPIryta/oYyl6AoQy2a2xCHmFsY2T4TzeeWa2F/ln+EXaD8Lhx0nqEyxzP8=@vger.kernel.org, AJvYcCWFu48quC2rwc6tL7GfhOTJIW7970xU0n/OJ4JOFa3IEWSu68pAvyQ+QjTkhdlyAZ/ZvOmc6GaSOq7RI7hF@vger.kernel.org X-Gm-Message-State: AOJu0YxFtCePICGwkPvj5kjPca0BY5HEdux8eCmubnrT+/v0u/JNsk+7 jI/ZEaLv2zJmufrVCjr+mN/SdHrYJEKkn2Zxu99oQi7IjlTtdkXM8IN1Sw== X-Google-Smtp-Source: AGHT+IECkPu3D+s7ADbBKpqE8Om8rDwhCKAn/xhD3/pGA/gnSbaoQgwKeI10mXPkhw1YYzigpCvePQ== X-Received: by 2002:a05:690c:ed2:b0:6e2:1842:c2b1 with SMTP id 00721157ae682-6e3471e8cf2mr90783327b3.0.1728915244819; Mon, 14 Oct 2024 07:14:04 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6e332c27cd5sm15160497b3.102.2024.10.14.07.14.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:14:04 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 6/7] streamline_config.pl: process config options set to "y" Date: Mon, 14 Oct 2024 10:13:36 -0400 Message-ID: <20241014141345.5680-7-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 An assumption made in this script is that the config options do not need to be processed because they will simply be in the new config file. This assumption is incorrect. Process the config entries set to "y" because those config entries might have dependencies set to "m". If a config entry is set to "m" and is not loaded directly into the machine, the script will currently turn off that config entry; however, if that turned off config entry is a dependency for a "y" option. that means the config entry set to "y" will also be turned off later when the conf executive file is called. Here is a model of the problem (arrows show dependency): Original config file Config_1 (m) <-- Config_2 (y) Config_1 is not loaded in this example, so it is turned off. After scripts/kconfig/streamline_config.pl, but before scripts/kconfig/conf Config_1 (n) <-- Config_2 (y) After scripts/kconfig/conf Config_1 (n) <-- Config_2 (n) It should also be noted that any module in the dependency chain will also be turned off, even if that module is loaded directly onto the computer. Here is an example: Original config file Config_1 (m) <-- Config_2 (y) <-- Config_3 (m) Config_3 will be loaded in this example. After scripts/kconfig/streamline_config.pl, but before scripts/kconfig/conf Config_1 (n) <-- Config_2 (y) <-- Config_3 (m) After scripts/kconfig/conf Config_1 (n) <-- Config_2 (n) <-- Config_3 (n) Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-8-david.hunter.linux@gmail.com/ V2 - change subject - changed part of the code that only processed config options set to "m" so that config options set to "y" are processed. I forgot to put this in v1 when making the series patch. - removed an unneccessary condition that would have skipped a dependency loop. --- scripts/kconfig/streamline_config.pl | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 4149c4b344db..c3b434220c9f 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -473,6 +473,11 @@ foreach my $line (@config_file) { if (/(CONFIG_[$valid]*)=(m|y)/) { $orig_configs{$1} = $2; + # all configs options set to 'y' need to be processed + if ($2 eq "y") { + $configs{$1}= $2; + } + } } @@ -499,8 +504,8 @@ sub parse_config_depends $p =~ s/^[^$valid]*[$valid]+//; - # We only need to process if the depend config is a module - if (!defined($orig_configs{$conf}) || $orig_configs{$conf} eq "y") { + # Make sure that this config exists in the current .config file + if (!defined($orig_configs{$conf})) { next; } @@ -600,12 +605,6 @@ sub loop_depend { forloop: foreach my $config (keys %configs) { - - # If this config is not a module, we do not need to process it - if (defined($orig_configs{$config}) && $orig_configs{$config} ne "m") { - next forloop; - } - $config =~ s/^CONFIG_//; $depconfig = $config; From patchwork Mon Oct 14 14:13:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hunter X-Patchwork-Id: 13835110 Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A6A41AE006; Mon, 14 Oct 2024 14:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915248; cv=none; b=TAQ1J9XE1n93xFhystfdZPzCO2BsFfjxrd3EF1qHTecMPID8XEAA7kvSQreb93c/NXMdYNIz1lOizDb9qUIUkG9myuhlIHvif2rSH0D3CBb8klL2d/jskXDTm0BL2YDawKq6PecTSM8jBE/2TQRSDFFYzptwdyEojReYZ/OCFt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915248; c=relaxed/simple; bh=hJarxn2Y1zVQhCmZDCe2jd66Z7ijIydSZICRs7ZM8lE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RQ995Sh1IFwRP8CQpVliumJGhJMdRobfGRZb5O4uHf2+zFUoQcOS8diA9uRnWWYcciHkPg+ocGxhcVVLtESujobQRubWdYao8YD42UqAggMmTOGVJHjsU+Zp0Rx2mt5igpG1gKyYPx4VuJb82sLBSwja7ns7GXXOdyFpHXHGBc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kadbf4Dq; arc=none smtp.client-ip=209.85.219.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kadbf4Dq" Received: by mail-yb1-f181.google.com with SMTP id 3f1490d57ef6-e2914e73ea4so2946537276.3; Mon, 14 Oct 2024 07:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728915246; x=1729520046; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eGa7q+R5O0ISTIPA10Zf/oodDHDm2UNZhh4hDXYuXxM=; b=Kadbf4DqJuLLFqY9eUX3AieUh+i91CQhlilxZz6UbEA0VUzDqpqH7Pwuk03V3Q+IH4 83FyQmX0CRdbqJP6ht5z8wzrHYjA9cHkVq3xdOyohA22FGlZERSM1D80yYKvAqWTrSN3 KSEFa5ttgGKjkq0vpNHi8JAK678PwwVd9TWRRvSd0C3g1cjAiJZ6qrtOE56VM+2rwpUi uEwSL+yioX7SvWcIsmtO2iIG0FK7UX9k2erpW8J722vALe0IGCGDPezp4adPegd+rrX7 3ysbWxYyJ1nys+hc4B5HuVW1LaEsD4+gIZkJ0OArMKL8kbjA66LXF57Kkxbkuw0KE7Hd D/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728915246; x=1729520046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eGa7q+R5O0ISTIPA10Zf/oodDHDm2UNZhh4hDXYuXxM=; b=Ct+OLDrtFTlOYp+Pfz/ztr77r8qEwxbxI+3a0Nf8pSdUUJQYcUqyuEKC2UFyLpGvJi EPdtcShDpzyFMdeLvwcmITXWkvhuC6zIm4H+E4JDBZrzEQ5/MRtpFLs4x/zcNQW8wRHQ eM+qSt7j9YDlqatNVpidhgGQmhHiITJO2cRouedhFfORLgSQycFmHS40ppNKEN9gtJn+ AJishw8LYhXtd+OlPHP3IbktxOYRw1VeAFzcu/eF/Jwip61M5t76qT+Le304epnQfyS6 H6r9Y5qtFK6PGIljxzaQDl+vMfx/HeXpX915O9+l+tnoqFoPSCueWkJQU4iNsE2o65JU rVjQ== X-Forwarded-Encrypted: i=1; AJvYcCUPois2oPCP/GgF1pXSi0w9mhlftRxtx0bfwzrEQ0ehWZ3Oo2K6HZKcIBrS1HuumlHONxuRpFPeX38F48RY@vger.kernel.org, AJvYcCVyVbVwbq3lAqiAnM38uyvY+IPBPV8SDXIsul0Lbo+fq9GV0/RcwjpWe8YO/hyzjb2YLgfbiIBTyx0XH2k=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0INwTFVek+Z44IkYZ20/ddNdHBVK351OerX7dlE+NRjQQcTbp 0ChalyeHaa2HUKUUsQcgC7St0DS+3KXPzbDht9BXsry5ZqAc9+7QFvUtJw== X-Google-Smtp-Source: AGHT+IHlFTRwJlflqpvWkywQCD3Duna3aG647rvmp9jsRWkEF+921voUiZX9u+JHbF7nOYfMzeDUyA== X-Received: by 2002:a05:6902:18cc:b0:e28:fdd7:b902 with SMTP id 3f1490d57ef6-e2919deebd2mr8508168276.37.1728915246089; Mon, 14 Oct 2024 07:14:06 -0700 (PDT) Received: from localhost (57-135-107-183.static4.bluestreamfiber.net. [57.135.107.183]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e290ef5df1csm2442824276.50.2024.10.14.07.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 07:14:05 -0700 (PDT) From: David Hunter To: Masahiro Yamada Cc: David Hunter , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, javier.carrasco.cruz@gmail.com, Steven Rostedt Subject: [PATCH v2 7/7] streamline_config.pl: check prompt for bool options Date: Mon, 14 Oct 2024 10:13:37 -0400 Message-ID: <20241014141345.5680-8-david.hunter.linux@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014141345.5680-1-david.hunter.linux@gmail.com> References: <20241014141345.5680-1-david.hunter.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Select configs that do not have a prompt. Config options can be bool or tristate. Ensure that bool options are also selected. Signed-off-by: David Hunter --- V1 https://lore.kernel.org/all/20240913171205.22126-2-david.hunter.linux@gmail.com/ V2 - changed patch subject - changed the order of this patch in the series patch --- scripts/kconfig/streamline_config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 4038afed2926..8c75ab888f87 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -273,7 +273,7 @@ sub read_kconfig { } # configs without prompts must be selected - } elsif ($state ne "NONE" && /^\s*(tristate\s+\S|prompt\b)/) { + } elsif ($state ne "NONE" && /^\s*((bool|tristate)\s+\S|prompt\b)/) { # note if the config has a prompt $prompts{$config} = 1;