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 527B28E6D for ; Thu, 24 Sep 2015 09:34:32 +0200 (CEST) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 9DA5C2ED13A for ; Thu, 24 Sep 2015 07:34:31 +0000 (UTC) Received: from dhcp195.koti.laiskiainen.org.com (vpn1-7-167.ams2.redhat.com [10.36.7.167]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8O7YOAC024787 for ; Thu, 24 Sep 2015 03:34:31 -0400 From: Panu Matilainen To: dev@dpdk.org Date: Thu, 24 Sep 2015 10:34:03 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Subject: [dpdk-dev] [PATCH 2/3] scripts: move two identical config fixups into a function 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, 24 Sep 2015 07:34:32 -0000 Signed-off-by: Panu Matilainen --- scripts/validate-abi.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/validate-abi.sh b/scripts/validate-abi.sh index b9c9989..4b555de 100755 --- a/scripts/validate-abi.sh +++ b/scripts/validate-abi.sh @@ -81,6 +81,15 @@ cleanup_and_exit() { exit $1 } +# 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 +} + ########################################### #START ############################################ @@ -154,12 +163,7 @@ log "INFO" "Checking out version $TAG1 of the dpdk" # Move to the old version of the tree git checkout $TAG1 -# Make sure we configure SHARED libraries -# Also turn off IGB and KNI as those require kernel headers to build -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 +fixup_config # Checking abi compliance relies on using the dwarf information in # The shared objects. Thats only included in the DSO's if we build @@ -167,6 +171,8 @@ sed -i -e"$ a\CONFIG_RTE_LIBRTE_KNI=n" config/defconfig_$TARGET export EXTRA_CFLAGS="$EXTRA_CFLAGS -g" export EXTRA_LDFLAGS="$EXTRA_LDFLAGS -g" +fixup_config + # Now configure the build log "INFO" "Configuring DPDK $TAG1" make config T=$TARGET O=$TARGET > $VERBOSE 2>&1 @@ -196,13 +202,6 @@ git reset --hard log "INFO" "Checking out version $TAG2 of the dpdk" git checkout $TAG2 -# Make sure we configure SHARED libraries -# Also turn off IGB and KNI as those require kernel headers to build -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 - # Now configure the build log "INFO" "Configuring DPDK $TAG2" make config T=$TARGET O=$TARGET > $VERBOSE 2>&1 -- 2.4.3