Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp1525959rdb; Thu, 7 Dec 2023 01:19:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyiPmrnNGWrTfgkGv2VHdo+E9TsMPss7xkFXgoLX9tz70p+qGs/70Sv75kPPgUy9vPZEdJ X-Received: by 2002:a92:ce48:0:b0:35d:768e:871e with SMTP id a8-20020a92ce48000000b0035d768e871emr2782080ilr.4.1701940777998; Thu, 07 Dec 2023 01:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701940777; cv=none; d=google.com; s=arc-20160816; b=WBlpG/KVeT2qPYjA6pju4lfMihHkWxaeVi4rB82V2o0y0Qo8XpWDSe25nyk3nRkMpJ TdpeECPZP6xYnv80TGK6+GrHQp7NCowINB40MBVn9T0v+/AxQHE9haswo/F3b/wW4SBE CQBuwfW4DaHj+eD2fFRqf6LhsfK5VP1VTKcny2WvA1uOqZPaRW7LTTw0hAQPk2kTLMva eCytnU2R+I8EWVZQyZDGqUlgywAbuDaYGQDD763GdJGehps46Q5bEl1tIaEGT7A3iJ1a ZtpnCw9+61WgsOWMhkQy8RtWyL4shwkyqi3SXHCB/ICAMK7vScLiiZ21E1a2FH2DmIE+ 4MJQ== 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=sm/lzpAvhuHS3gU6Neby55nIAMb+5+9K2s31MjKibKc=; fh=UrpkSxacRnNe3pAqpeGIIGAGFrEOZ8ZAHCW+EatPIvM=; b=sOQvv1JWC3Mga4DFpK4pV+zLhmud3GIxm2ev9qp1S99mFxBh4AWF91oyXpMEDSnwvV 7HdJOcpragAm3h2zk17+yU2VOi9+ck/EKlYU+U/ajjmwWfb9j12JAN2glvMJ8YByJ84v OvdMqUMzCNPzAyLh1jwQjtixNGuTwbdMm/rbKAwdNQAQMjyE+Dkp/gjfCyG5cAMOVCG5 /mfuslKrvqhnKICNCBF3I3dzD2gKBWit1Xpxi7oEaoBe+GihrTbqzZz7Lwl1TExb5yTz vKsFmik669lqdA9U2zcfEaKFNiUkS9t7dxnYj10l8DQ1rnPIDq3gAUw71mI25e7KKH8X aCQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bTUvobIn; 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 r12-20020a6560cc000000b005c66e020cbdsi868846pgv.709.2023.12.07.01.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 01:19:37 -0800 (PST) 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=bTUvobIn; 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 1C3AF831D2DA; Thu, 7 Dec 2023 01:19:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378730AbjLGJTO (ORCPT + 99 others); Thu, 7 Dec 2023 04:19:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232366AbjLGJTB (ORCPT ); Thu, 7 Dec 2023 04:19:01 -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 A79C210F1; Thu, 7 Dec 2023 01:19:03 -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 4514C6607391; Thu, 7 Dec 2023 09:18:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701940742; bh=Mr77Mnfxx47EKwKczlFzG/RZhOtpwmigpFeB8yxRJNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bTUvobInVnqFWIb2QNHJRRJNPkSZc+hRREr6bY2gUx0L2dWCjW2capjl7Y2G9Wh/k wyIBPyZzm3wDAgZWkJnWj6pzW2CUuhncd7Rv7P92k8JM4FQ0J7/gl/5rMYqJ9GWwCY gGjXt0mkqmCFZo7UPHKSxD83DsBrJNl1jm6jIyR3IU6aqcbV52TWf6IxERHAAUU+YZ 63erHer9VGzMYnmAKaVpWsOOwa3DavdvXpiJ4KNKN7byEwIgIM1YUZcMFQRimn3xKo yXNvnZNPzmE4so92v652EUABTXHRlrlDFY6nPBK6E6zQGFjFa9XUdrHyYnVzphj8Hr cNS+9f4iCs/Pg== 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 v7 05/10] drm: ci: Use scripts/config to enable/disable configs Date: Thu, 7 Dec 2023 14:48:26 +0530 Message-Id: <20231207091831.660054-6-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231207091831.660054-1-vignesh.raman@collabora.com> References: <20231207091831.660054-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 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, 07 Dec 2023 01:19:35 -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 v7: - 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