From patchwork Thu Sep 14 08:54:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 139569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp323359vqi; Thu, 14 Sep 2023 05:51:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPJnxR+b6PoZwWEaHjCvZ6QRgOQ5NGyBqT9z3jQzJWCQR7Gk/xTM69ZaARcycoW+bOdfRh X-Received: by 2002:a54:4406:0:b0:3a8:4f87:f92c with SMTP id k6-20020a544406000000b003a84f87f92cmr5033764oiw.44.1694695911042; Thu, 14 Sep 2023 05:51:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694695911; cv=none; d=google.com; s=arc-20160816; b=praKmsSgc5PSkfIPAUlDTJzwYYfwReVTBvNT6kVBhN5on3fdwCcmwD59VjPi1fVOm9 Md7tfXYhalAes2j5XM2rtTp0Z4stvLA74kSbOzCdVS8nNFFCFxhm3kYzuk0jdmOLH5EQ 6IZahavvfXFBhC02xVcihQGTloVHUcAGnrBwkpO7r3Z5geTi3EX1ekycSK0tJ4P0+8cT pigG3KVXN/O6gVADGUudwHd0hGRaf6tzFk20MvYXSFd6i7DrMBgQybJi8kDUjvqq1nyF RAFYUYNQyBNbBfqNFI9KW1Z0T5o9qCI/ClkBdPiHv5xnA+ruXIFUf8U9rSH3tH8eBhcD oosQ== 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=bhj8jm9wkvzRD7mRDwMCt76IT605s2TInxdy7upSRhc=; fh=cxnKBCJg0bNcqydgpga3RSEfaAMQprbtiSOJOcJS6+w=; b=DQHtP1X9G+KsS1IgKRWR14tIsrQLT7lpeQIE2L4qErEF5mRze0IDpKQn+AwQ0IfH7D wZDXod8Xzkx4SIZTcoRO5Cq+R14xr5qEU8WjfFB8rsNaOidXnpenZWDhL9nzxocJdnPe POUFHpNITkHwdtWuBNTVy8R/y/8EOy+UAeUMsGdNUNdyvg/J9qBx3K2X8wCP/UhJa3X/ IAOjDsntyXEoAXuE0uwWQfS2/nnRLAnZg5GI5pHT2KWwg+TNoYPFhAFYDgcBXEKzCNvV /ZxrrytlHkmUZmObgVOQnkqaRYRmHNNZh+QONcpFb01yYlycQo7MiZnVEktVzC+qvzPb jn5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="L2U/iAER"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id ca20-20020a056a02069400b00577f87e6214si1689284pgb.386.2023.09.14.05.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:51:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="L2U/iAER"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 9C91981B1782; Thu, 14 Sep 2023 01:55:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236674AbjINIzj (ORCPT + 35 others); Thu, 14 Sep 2023 04:55:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236744AbjINIzQ (ORCPT ); Thu, 14 Sep 2023 04:55:16 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C1DD2130; Thu, 14 Sep 2023 01:55:08 -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 0576B6607341; Thu, 14 Sep 2023 09:55:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694681707; bh=zENsozfUsG28BDpE/lFC/hQUZaZONyzVCg0HBSjy2Ek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L2U/iAERmuKstZOpmzII6rshziJBI0086ArkXzKd42+PuLdps71ACh5Drio12ZmDD eCo4zNmBGn59IvVUZnMiyta46KTJ0CeKTI3Ezntcx4zxC1GgGwT/+qOWZcE1Dz+5MN EqjjPVGAaIqnS1chnAjmvjCOZTfmEHzROmb2V7bmXm+0RDadzQqfL/qD6HHfG0/wss PF6ZM205gB8+KcVEy05EtON7TL6TsAUQ56kVSzZCQN5lSPMmAv+nk72S57lDoEgHei e1/F1rF7Gp4UoRD/Fn8FnkC490T6av3zPrfdlzJsSo9IA47S7Mug5cSyJR5QMbqRJk Th0tXImRyKjDw== 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 v4 7/7] drm: ci: Use scripts/config to enable/disable configs Date: Thu, 14 Sep 2023 14:24:26 +0530 Message-Id: <20230914085426.883255-8-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230914085426.883255-1-vignesh.raman@collabora.com> References: <20230914085426.883255-1-vignesh.raman@collabora.com> MIME-Version: 1.0 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 (agentk.vger.email [0.0.0.0]); Thu, 14 Sep 2023 01:55:59 -0700 (PDT) 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777017459492919082 X-GMAIL-MSGID: 1777017459492919082 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 --- 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 58b71538f489..bfe161b47951 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/