From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A77B42B9B for ; Thu, 10 Mar 2016 13:36:12 +0100 (CET) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 2AB74C062C96; Thu, 10 Mar 2016 12:36:12 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org (vpn1-4-209.ams2.redhat.com [10.36.4.209]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2ACaAxT010616; Thu, 10 Mar 2016 07:36:11 -0500 To: Ferruh Yigit , dev@dpdk.org References: <2e7fcffec863b7f60cf62707b3be3dd81a5de991.1457607217.git.pmatilai@redhat.com> <56E167A2.2070807@intel.com> From: Panu Matilainen Message-ID: <56E16A3A.8000100@redhat.com> Date: Thu, 10 Mar 2016 14:36:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <56E167A2.2070807@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Subject: Re: [dpdk-dev] [PATCH 2/3] scripts: avoid editing defconfig_* files in validate-abi.sh X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2016 12:36:12 -0000 On 03/10/2016 02:25 PM, Ferruh Yigit wrote: > On 3/10/2016 10:53 AM, Panu Matilainen wrote: >> The defconfig_* files are templates which are not supposed to be >> edited, and doing so tends to leave unwanted cruft behind. Edit >> the "working copy" config instead, which is the intended DPDK way. >> >> Signed-off-by: Panu Matilainen >> --- >> scripts/validate-abi.sh | 18 +++++++++--------- >> 1 file changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/scripts/validate-abi.sh b/scripts/validate-abi.sh >> index f094582..ea60639 100755 >> --- a/scripts/validate-abi.sh >> +++ b/scripts/validate-abi.sh >> @@ -90,11 +90,11 @@ cleanup_and_exit() { >> # Make sure we configure SHARED libraries >> # Also turn off IGB and KNI as those require kernel headers to build >> fixup_config() { >> - sed -i -e"$ a\CONFIG_RTE_BUILD_SHARED_LIB=y" config/defconfig_$TARGET >> - sed -i -e"$ a\CONFIG_RTE_NEXT_ABI=n" config/defconfig_$TARGET >> - sed -i -e"$ a\CONFIG_RTE_EAL_IGB_UIO=n" config/defconfig_$TARGET >> - sed -i -e"$ a\CONFIG_RTE_LIBRTE_KNI=n" config/defconfig_$TARGET >> - sed -i -e"$ a\CONFIG_RTE_KNI_KMOD=n" config/defconfig_$TARGET >> + sed -i -e"$ a\CONFIG_RTE_BUILD_SHARED_LIB=y" $TARGET/.config >> + sed -i -e"$ a\CONFIG_RTE_NEXT_ABI=n" $TARGET/.config >> + sed -i -e"$ a\CONFIG_RTE_EAL_IGB_UIO=n" $TARGET/.config >> + sed -i -e"$ a\CONFIG_RTE_LIBRTE_KNI=n" $TARGET/.config >> + sed -i -e"$ a\CONFIG_RTE_KNI_KMOD=n" $TARGET/.config >> } >> > Since working .config copy updated, is there a benefit to save and > restore the original .config file (if exists)? Maybe, but it already is being modified and not restored, so that behavior is not new in this patch. > And is "git reset --hard" still required in the script? Perhaps not, strictly speaking. It does ensure there are no other artifacts left around though. - Panu - > Thanks, > ferruh >