Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp168552rdb; Thu, 19 Oct 2023 00:08:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqbprHcwN/8ZV0b9W7cdbDNo7afpqWkLxp+tfzshX8MJEp8uAa7nM/dcQ5TQ3ACZlV4+Bm X-Received: by 2002:aca:1907:0:b0:3b0:daf8:954 with SMTP id l7-20020aca1907000000b003b0daf80954mr1347876oii.49.1697699283518; Thu, 19 Oct 2023 00:08:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697699283; cv=none; d=google.com; s=arc-20160816; b=dtayi29JwcM1An549+AnKzttNdxcnFjSD0YbY6kWOBUrQSfFtsEkRmn1NnfWxcEzow nOKMMX5P+KSHCBYWoNyyObjDy36gMoZirxBOTGCVaWvysWYLmBxJOh2UJ2x2ZW3cW+kv yrJSVCZksMqmMI2W0cDRoHR3BT78CAVWAT1DqStkQH5nqZE9ow7htKev3hdi9nLHzkFg UChBwjVhYvsLaSmT8janvDMzocvst2vWnNsjiswVucJu3iGujBp/M2UEQeJnd9TpAB12 rNCdBwhfQGfiZNUrdJUumSwEdSMc/8DO44PApRk0XTlrEHE+peCArbxmlXbg01n5lGbn zRIQ== 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=TE8MF7qBhi5QHO4LbdRM33P18HVjE0D4J/UlPyVhEas=; fh=UrpkSxacRnNe3pAqpeGIIGAGFrEOZ8ZAHCW+EatPIvM=; b=qsxBj0kvMCGNUx38yCfq/vfPNeZfNcurueutt0VhCnvEaMwaC1rB9hugrOWmz0IHRy WRYjyyyhR98kXTTlketyaNytJZ5jwL+TDn5ekqiDjP2GzAZrlcjN8yn67X2TqsrOevrM 9z/DIpCtbGIdD3broR89Yx6I9L3bC4npwsTed7nBdL9aYk+4l9ddX5enA2lcjw3K8sY0 dwN3X42e45BZwwkR+f3g1KgMDectPeSbYDyCoOcmXlGyWSRVWsVwwSZnDAQxlT7L3QAG UO/jYVToonDASSydjM7vST56JO8PVa3REz3eHXQySr6TqYnzL1R8t4zfXLKxJP0+1j7Z Zu7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nbAReMsK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id j8-20020a056a00174800b0068bf645ac9bsi5065481pfc.238.2023.10.19.00.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:08:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nbAReMsK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 5D75A826E691; Thu, 19 Oct 2023 00:08:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234971AbjJSHHx (ORCPT + 99 others); Thu, 19 Oct 2023 03:07:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344895AbjJSHHi (ORCPT ); Thu, 19 Oct 2023 03:07:38 -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 578C7185; Thu, 19 Oct 2023 00:07:34 -0700 (PDT) Received: from localhost.localdomain (unknown [103.93.195.74]) (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 4B29066072FF; Thu, 19 Oct 2023 08:07:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697699253; bh=35DFjxAotz1IVCItB2GsZcDMQyNA7MbHQR3Htt8pU1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbAReMsKB3X1LneMPjihBxcf/Yb7zcNIJ+3pD75rfBDPtBVZP7D+f/klvBlsqycvt SILiNS67mA9BDON/3Sqx7MCGGdzy7OBKMx1NrKWQAH9h2dCzaj99A+g3TzY94wye57 mkHK9nNDJTMAh7k7jrK1XuObVCRD7wklTl8Cws9fsugii4D4YUGeMPhEWqinJN64Q/ KaRAz9/6Ijff1n3uXf4baqy03ui5Ikh78zZcEysO89niCSc2StIks2hsE9f1DpAHSc t5P04JquPu2sJ1bwDq3zoIMe4vJpkgRUa0hjgPkTT3ZKyabeTj4RVDTXigEWFnWSDA hQeVQYygD0Fbg== 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-arm-msm@vger.kernel.org Subject: [PATCH v5 5/9] drm: ci: Use scripts/config to enable/disable configs Date: Thu, 19 Oct 2023 12:36:46 +0530 Message-Id: <20231019070650.61159-6-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231019070650.61159-1-vignesh.raman@collabora.com> References: <20231019070650.61159-1-vignesh.raman@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Thu, 19 Oct 2023 00:08:01 -0700 (PDT) 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 Acked-by: Helen Koike 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 --- 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 b1ea9b458922..614111b7670b 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/ -- 2.40.1