From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 35967313E22 for ; Wed, 31 Dec 2025 08:41:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767170498; cv=none; b=ORErGuJF5YS5NjU3fTNFy5JBN73jZt/rh4vHak0c1kZIsDCSh6l7OVozT4EPrzfUuArC0lw0gveIcd7XRtjnwEyQ1Zs3MYyqkijBzk2WsugTkcM5KLMGOEwevGW9UUWzypCMjd2MENMcxR1joMuBRvSLvsT+3/BRntmRbpa86fk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767170498; c=relaxed/simple; bh=D37xojUglmR5RxiG3oEL2rlCJiKy/iqF2PU8QVo9pHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IPr9WqLhTauFs+1ii6J+07AK5hGpvpx2IMdS4MrIIeut983mFRQsbqr3+FPsltD03KWbrIY8NaBlrRyE6p05JiC5ETNpoDnO9aoNdyU5WlcubTO1UfCddV94FnIoSdm346+QLKwSaWKxvPTkgOdrsFPStkcKMoxxIfsSDgkNoj4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=bSCftVvI; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bSCftVvI" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-595819064cdso16836838e87.0 for ; Wed, 31 Dec 2025 00:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767170492; x=1767775292; 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=fh6xmyc7Ah435rH7wgWhAfHpOHtdWzPeIR+E5hmnxSw=; b=bSCftVvI1e2xcBH1aWywlfAUsdhUrLn22XKfZr11+I9SCFdHMqD9TLuTYVd+hl1SXr dpauJNQXvkmfFN3NN0vjCQgxxR9/A6VXeAtTPxzW6wTapnYEZxYc7pZ06IHWYW8KkhEt Xocl+/04hmvWxZmJrnAYSbcZOZWjy5lv3+q2C2k7QbgTJ5RDvU5KG1VzW1AAMYOSMxF5 XOLqiQ9+gVY42lLHbFr4LvwYzsSSGXFAX+Sk2egxgbO93SwQW+YM+Rvi2jaZjzo/9mi4 gBTOpcNOAbAUpnM/YwH6KrNkbjcthOKL8OWHws+nBxLKu+dyojTG0IZuEVWo6Y0Q9N67 VSZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767170492; x=1767775292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fh6xmyc7Ah435rH7wgWhAfHpOHtdWzPeIR+E5hmnxSw=; b=i9eZBrgHlDRLrLzhwo/IK433p2zhT+9c8dIPP/WIPwBElYz1emsd7K/Tl4nzzMH60Q DlmpWkniOzZSfejZp35D0ZJ3OyE+GuHrLcNYSJhCK+tPnj5CI3lLeFfrxgax2ZIIbAyH SL9DH+0o01+HPsot16ryOSCLF8W5wBUfm5OEffvH6t06LlRhe7wsA03yfDLl/alwFOKw 1nNoP5IozOl+AVBfeuEybIi9lnlYjCt0May8FhVT5iJFQDx3s+v8morySG5QHsAS79Hy NAMQTMTd9A/A4EikObJkVrXZSJJIwDaFxLoGPZFkdQM0EC/nOjY3P/1Q3gLYKAskbD/n 3jjw== X-Forwarded-Encrypted: i=1; AJvYcCWMLcHbkdHAN7xYSHIZCb/TL2zjaH3UOwskiWAcAmsJk7g9EWzgoUswJD2+eve6Lyh9aYb5NxEdJigY4fY=@vger.kernel.org X-Gm-Message-State: AOJu0YzbjZy9l3dmBBHqSY6MOCJQnK/aWXZAwbZJgnFPU/1uBCo3FT1U 5kbndTfOZ4mEmxg8bH1EZnZX3wb02We84zN3SJzzgACsEUoaNfsesdJAXVdGnCTphg8= X-Gm-Gg: AY/fxX4O29/UsIOxHZRvzPe03WmdLLxZkdzpHm3oqlntSjmLtgbrsRGKWh5sW5bgDQp /A259tOcoSkZMt/C5eisOXAjlFCVL7YWzmfx+3wlAz8Jfbopk4knZDD6ui2DAhRqMQ+PdYwwpok yIoZO9+fuN+XfrU0AbBYPsNIxR9gJHSIjXDV0XLUt6lftalxMjQ3MW7hWyaTQmd4vdF6kPCWZJD 5/4KTuyqgQ0u86j10gFLN5rSK3xHLfRMfC/BmmSv5oPz01wKpmXDpnJtND9hJc+PJpAR2PPNiEu BtT/0VeGt5sX82hQDTIJUTb2SUfHjcNq1uyRyB9z2LTMAaaMzuwu5QgzOTtDXjhr7uTaqsjaeiv cEVQYIhRP4c6CA1jgt4bJdQRZaEQ/6ZlDTIx+O4JJP9gX5d5sSX+Oo7NoQLO/SqEHYGryaq4heE WjGjyodSyxWWuR3TtcbqNVJQUP0GfPRcjIhtdkCKu+4dTk X-Google-Smtp-Source: AGHT+IEQSvTgAnpUnlCc1mU2K78cacnyMiomjfEx1WAlB21EaY5faLafEowfwC4zhRVNwvYH/2zl/A== X-Received: by 2002:a05:6512:3d9e:b0:595:7d7c:59a9 with SMTP id 2adb3069b0e04-59a17d6bb20mr13215379e87.22.1767170491651; Wed, 31 Dec 2025 00:41:31 -0800 (PST) Received: from nuoska (87-100-249-247.bb.dnainternet.fi. [87.100.249.247]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59a181beb5csm10666566e87.0.2025.12.31.00.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Dec 2025 00:41:31 -0800 (PST) From: Mikko Rapeli To: Nathan Chancellor , Nicolas Schier , Anders Roxell , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mikko Rapeli Subject: [PATCH v2 3/3] scripts: kconfig: merge_config.sh: warn on duplicate input files Date: Wed, 31 Dec 2025 10:40:50 +0200 Message-ID: <20251231084050.186874-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251231084050.186874-1-mikko.rapeli@linaro.org> References: <20251230205549.GE4062669@ax162> <20251231084050.186874-1-mikko.rapeli@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit External scripts like yocto kernel scc may provide same input config fragment multiple times. This may be a bug since processing same fragments multiple times can be time consuming. Cc: Anders Roxell Signed-off-by: Mikko Rapeli --- scripts/kconfig/merge_config.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) v2: no changes v1: https://lore.kernel.org/linux-kbuild/20251229114447.45236-1-mikko.rapeli@linaro.org/T/#t diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 462c791cca12..cc541a9686b8 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -130,6 +130,8 @@ trap clean_up EXIT cat $INITFILE > $TMP_FILE +PROCESSED_FILES="" + # Merge files, printing warnings on overridden values for ORIG_MERGE_FILE in $MERGE_LIST ; do echo "Merging $ORIG_MERGE_FILE" @@ -137,6 +139,14 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do echo "The merge file '$ORIG_MERGE_FILE' does not exist. Exit." >&2 exit 1 fi + + # Check for duplicate input files + case " $PROCESSED_FILES " in + *" $ORIG_MERGE_FILE "*) + ${WARNOVERRIDE} "WARNING: Input file provided multiple times: $ORIG_MERGE_FILE" + ;; + esac + # Use awk for single-pass processing instead of per-symbol grep/sed if ! "${AWK}" -v prefix="$CONFIG_PREFIX" \ -v warnoverride="$WARNOVERRIDE" \ @@ -259,6 +269,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do STRICT_MODE_VIOLATED=true fi mv "${TMP_FILE}.new" "$TMP_FILE" + PROCESSED_FILES="$PROCESSED_FILES $ORIG_MERGE_FILE" done if [ "$STRICT_MODE_VIOLATED" = "true" ]; then echo "The fragment redefined a value and strict mode had been passed." -- 2.34.1