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 <pmatilai at redhat.com> >> --- >> 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 >