Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4534170rdh; Wed, 29 Nov 2023 04:19:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTniusX/zMyqJcd3mfPQDaoRKHIGRX5/60xNJDVycnj/jOvL6l+l9dSx7P7bdzv0143N9u X-Received: by 2002:a5e:8614:0:b0:7b3:84f4:f003 with SMTP id z20-20020a5e8614000000b007b384f4f003mr14465894ioj.19.1701260389679; Wed, 29 Nov 2023 04:19:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701260389; cv=none; d=google.com; s=arc-20160816; b=lFPROFtB7bG2MTZE5BTdTDOdu6z9iEDoz9+Lw4n/uf2NRrBj3EBZ541sGKlRIY/R6p ecgAkNL8tqJuXhK/wDdkPe67SbgVzmNAUQ8/ZGdu12/8ryyaBYQa2TdmfjBu1vTSyGi3 NPHBoVbNnmqYR/hGuEKn41cYnWMR81hzYzykJ7vIXDPisJh7iWJ2DOwR43JcyrzUwNLF 5B/fYl8swEWac9czxVqfzwViHjufbKH5sqlC2Tru5oNY+w7jEkspSLLqvetSnyez2cLB /YB3qOP96x02a1KB1lb/FPy1yXIulSSwl8DcmFzw8nMc4KgPHr2DlUGKfqhvM4dLUiG4 pkKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Edy349FNAljpj2WbedkltWmMgsESaCDNN1TmpXeQWFo=; fh=cxnKBCJg0bNcqydgpga3RSEfaAMQprbtiSOJOcJS6+w=; b=GdENpRn8A5wzF8W+1m748n/bVqYBPgPvRcyb+zuLRtnlUeVZ5qMx52cDLPK4IDB9wR wD6R5vJ/7gYo25IsoEX+PVwnWdEiwXnMHXsSC5tkf5BMgMHOPYCXYgmGuntfZEsASSvg KoHu2Usue+zoTsbyM93RwL2wn6rZYn11aQYOQp4ADXqHIUnNlaUdo1H3uJVG7bW5jOug LcPFKDxSU24AqWwm7F8lAW38gKEkzttNCkVIWAcIryMLKKoLRBhF7VspLQ6+hx71Zwcz f8sGWHJRMpkwie9K2t+Pbt7UdsmmJdF2yLQUVKXoOv5WpWtEr/mTBLV5rypzom9H+WLM GOaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=JBI4zugh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id h13-20020a63df4d000000b005777bea0b6asi14554883pgj.859.2023.11.29.04.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 04:19:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=JBI4zugh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id CB48A804913F; Wed, 29 Nov 2023 04:19:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233277AbjK2MT0 (ORCPT + 99 others); Wed, 29 Nov 2023 07:19:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233540AbjK2MTP (ORCPT ); Wed, 29 Nov 2023 07:19:15 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 284EE1BC0; Wed, 29 Nov 2023 04:19:16 -0800 (PST) Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id 51A836607323; Wed, 29 Nov 2023 12:19:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701260354; bh=LAiI9Zj6sblQ9PE3ddYSUkjK2felt6gCjLGE+jeFyco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBI4zughUA/jDHu5gvDlkhlQ5iGsI0NYo5djTinqxMvhvHuDL9bSt1DDeaRw3TBAT ZiribR2NUqhV0adE8O1YoMaTEFRKv0yVj3zAmRa2W9wlPxBNBssuJACW/srDajZ1O4 iG9tvVfFGLM+nz4d0IfGEM8z+WXFDNn5wOvScmCRaVzjfzH5oUjg7AdsyK4PhFoBdA FTWe8m5UzZNrL1u7FY3c1Y5tXX97pTHJSl8PQEPYT+mZ6gIUR3dT45aiEPBLbXsKn7 UWvTMSQiBFwEkd2znzd6OkgY89FvIvgUxk8ik8lU5tMiQwK1Yc1wywyq3u5haVFEEh /waf/05mDmOwA== From: Vignesh Raman To: helen.koike@collabora.com, airlied@gmail.com, daniel@ffwll.ch Cc: david.heidelberg@collabora.com, sergi.blanch.torne@collabora.com, guilherme.gallo@collabora.com, daniels@collabora.com, gustavo.padovan@collabora.com, emma@anholt.net, robdclark@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org, linux-rockchip@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v6 05/10] drm: ci: Use scripts/config to enable/disable configs Date: Wed, 29 Nov 2023 17:48:36 +0530 Message-Id: <20231129121841.253223-6-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129121841.253223-1-vignesh.raman@collabora.com> References: <20231129121841.253223-1-vignesh.raman@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 29 Nov 2023 04:19:45 -0800 (PST) Instead of modifying files in git to enable/disable configs, use scripts/config on the .config file which will be used for building the kernel. Acked-by: Helen Koike Suggested-by: Jani Nikula Signed-off-by: Vignesh Raman --- v2: - Added a new patch in the series to use scripts/config to enable/disable configs v3: - No changes v4: - No changes v5: - No changes v6: - No changes --- drivers/gpu/drm/ci/build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index e2260b4a1c67..97ff43759b91 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -75,19 +75,19 @@ else fi fi -for opt in $ENABLE_KCONFIGS; do - echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config -done -for opt in $DISABLE_KCONFIGS; do - echo CONFIG_$opt=n >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config -done - if [[ -n "${MERGE_FRAGMENT}" ]]; then ./scripts/kconfig/merge_config.sh ${DEFCONFIG} drivers/gpu/drm/ci/${MERGE_FRAGMENT} else make `basename ${DEFCONFIG}` fi +for opt in $ENABLE_KCONFIGS; do + ./scripts/config --enable CONFIG_$opt +done +for opt in $DISABLE_KCONFIGS; do + ./scripts/config --disable CONFIG_$opt +done + make ${KERNEL_IMAGE_NAME} mkdir -p /lava-files/ -- 2.40.1