From patchwork Fri Sep 8 15:22:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13377622 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84D9DEE8015 for ; Fri, 8 Sep 2023 15:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233648AbjIHPYb (ORCPT ); Fri, 8 Sep 2023 11:24:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244614AbjIHPYa (ORCPT ); Fri, 8 Sep 2023 11:24:30 -0400 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 ADBB9212D; Fri, 8 Sep 2023 08:23:58 -0700 (PDT) Received: from localhost.localdomain (unknown [171.76.82.102]) (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 B15E666072AC; Fri, 8 Sep 2023 16:23:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694186637; bh=5EL9eVG51FsQl3AUWqIFCSbQ/zvgCyfjZgP+m+A22ZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QOBXsLznaxQVmUs/xs/cLj/OKsA8O9X3FCFqolqoPKMoKNn05MfErt3NG9MFj60VA HW32LskUPFhwmEvWQQCiw2VrCaW2zoCN+o62NO8pIJ7YlZ0iny+kDP2pc6+QtRyBE+ bafb6cLs1viGLSnW5jwpHS3H2yzl9JW9PcY++Yi7C6R7E0MSBZsboUjz/ZLbl7/Ve9 LbbsN7m7IOMFd46fFKgOAUjRn0x9Zg8QWMKas08G7OrjGCrAu6TIM0CsX+Wk0XHejb BW4xRUQJXvz921dt/+jcI9YYcIZ5qp431ANmpEuRD1lEgpif92WUN9V1cRsKcWvxAB BGzh3vwSim6VQ== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Cc: helen.koike@collabora.com, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, david.heidelberg@collabora.com, daniels@collabora.com, gustavo.padovan@collabora.com, angelogioacchino.delregno@collabora.com, emma@anholt.net, robclark@freedesktop.org, robdclark@google.com, anholt@google.com, robdclark@gmail.com, airlied@gmail.com, daniel@ffwll.ch, jani.nikula@linux.intel.com, mripard@kernel.org, dmitry.baryshkov@linaro.org, matthias.bgg@gmail.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v3 9/9] drm: ci: Use scripts/config to enable/disable configs Date: Fri, 8 Sep 2023 20:52:25 +0530 Message-Id: <20230908152225.432139-10-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908152225.432139-1-vignesh.raman@collabora.com> References: <20230908152225.432139-1-vignesh.raman@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. Suggested-by: Jani Nikula Signed-off-by: Vignesh Raman Acked-by: Helen Koike --- v2: - Added a new patch in the series to use scripts/config to enable/disable configs v3: - 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 092c195af242..093929a115de 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -70,19 +70,19 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then 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/