From mboxrd@z Thu Jan 1 00:00:00 1970 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 6FFD8CA0EF1 for ; Tue, 12 Sep 2023 17:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236417AbjILRCL (ORCPT ); Tue, 12 Sep 2023 13:02:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236718AbjILRCH (ORCPT ); Tue, 12 Sep 2023 13:02:07 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56880173E; Tue, 12 Sep 2023 10:02:00 -0700 (PDT) Received: from [192.168.0.106] (unknown [186.235.7.101]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: koike) by madras.collabora.co.uk (Postfix) with ESMTPSA id CFD3066072B4; Tue, 12 Sep 2023 18:01:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694538119; bh=sm5+is+zMEhHqe7EnrHHFL2UbWWzWkGkszkqR/V7AI0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=LalD6Suk+Ksvjr+uEeVaKamf2/KVIIRDW+wLkOZj1Iu7g9MT2nSVHIFwGDcF6N5Ua P7EwJ6QhNOmhMxS0DOZfWAcY6sngRbfeRwdVyeS+TRPKOJAHu1svXPveHbTjiYDJlD 0dXZ84byE0SmIZ9GyyIMXwKxDJ7nfxdh64VClNiDXQR1IHqO9RuuZkU0l4sA9L9dPE s1raH+ZGKw8GAXouxv3XUTfm/wHJS7YswMT0esnSAYoYBDgIxk5o6WDsaP9NtVu8E6 Ur5FeEB/ctyIG8LYdtz84KMlh8ewDG0eW6P/AW7vpyO7ceojFdsFlEaS3szgs1CQc0 miKMaoyVbaWmg== Message-ID: Date: Tue, 12 Sep 2023 14:01:46 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH v3 9/9] drm: ci: Use scripts/config to enable/disable configs Content-Language: en-US To: Vignesh Raman , dri-devel@lists.freedesktop.org Cc: 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 References: <20230908152225.432139-1-vignesh.raman@collabora.com> <20230908152225.432139-10-vignesh.raman@collabora.com> From: Helen Koike In-Reply-To: <20230908152225.432139-10-vignesh.raman@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 08/09/2023 12:22, Vignesh Raman wrote: > 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/ From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3978CA0ED2 for ; Tue, 12 Sep 2023 17:02:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26CB910E44C; Tue, 12 Sep 2023 17:02:02 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53A5310E44C for ; Tue, 12 Sep 2023 17:02:00 +0000 (UTC) Received: from [192.168.0.106] (unknown [186.235.7.101]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: koike) by madras.collabora.co.uk (Postfix) with ESMTPSA id CFD3066072B4; Tue, 12 Sep 2023 18:01:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694538119; bh=sm5+is+zMEhHqe7EnrHHFL2UbWWzWkGkszkqR/V7AI0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=LalD6Suk+Ksvjr+uEeVaKamf2/KVIIRDW+wLkOZj1Iu7g9MT2nSVHIFwGDcF6N5Ua P7EwJ6QhNOmhMxS0DOZfWAcY6sngRbfeRwdVyeS+TRPKOJAHu1svXPveHbTjiYDJlD 0dXZ84byE0SmIZ9GyyIMXwKxDJ7nfxdh64VClNiDXQR1IHqO9RuuZkU0l4sA9L9dPE s1raH+ZGKw8GAXouxv3XUTfm/wHJS7YswMT0esnSAYoYBDgIxk5o6WDsaP9NtVu8E6 Ur5FeEB/ctyIG8LYdtz84KMlh8ewDG0eW6P/AW7vpyO7ceojFdsFlEaS3szgs1CQc0 miKMaoyVbaWmg== Message-ID: Date: Tue, 12 Sep 2023 14:01:46 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH v3 9/9] drm: ci: Use scripts/config to enable/disable configs Content-Language: en-US To: Vignesh Raman , dri-devel@lists.freedesktop.org References: <20230908152225.432139-1-vignesh.raman@collabora.com> <20230908152225.432139-10-vignesh.raman@collabora.com> From: Helen Koike In-Reply-To: <20230908152225.432139-10-vignesh.raman@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emma@anholt.net, virtualization@lists.linux-foundation.org, krzysztof.kozlowski+dt@linaro.org, robdclark@google.com, david.heidelberg@collabora.com, sergi.blanch.torne@collabora.com, gustavo.padovan@collabora.com, agross@kernel.org, devicetree@vger.kernel.org, conor+dt@kernel.org, daniels@collabora.com, linux-arm-msm@vger.kernel.org, mripard@kernel.org, anholt@google.com, linux-mediatek@lists.infradead.org, robclark@freedesktop.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, guilherme.gallo@collabora.com, linux-kernel@vger.kernel.org, konrad.dybcio@linaro.org, robh+dt@kernel.org, dmitry.baryshkov@linaro.org, andersson@kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 08/09/2023 12:22, Vignesh Raman wrote: > 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/