From: Panu Matilainen <pmatilai@redhat.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 2/3] scripts: avoid editing defconfig_* files in validate-abi.sh
Date: Thu, 10 Mar 2016 12:53:36 +0200 [thread overview]
Message-ID: <2e7fcffec863b7f60cf62707b3be3dd81a5de991.1457607217.git.pmatilai@redhat.com> (raw)
In-Reply-To: <c48db14f5764bcef620f19a1fa8d5eed1493cafd.1457607217.git.pmatilai@redhat.com>
In-Reply-To: <c48db14f5764bcef620f19a1fa8d5eed1493cafd.1457607217.git.pmatilai@redhat.com>
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@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
}
###########################################
@@ -177,8 +177,6 @@ log "INFO" "Checking out version $TAG1 of the dpdk"
# Move to the old version of the tree
git checkout $HASH1
-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
# with -g
@@ -189,6 +187,8 @@ export EXTRA_LDFLAGS="$EXTRA_LDFLAGS -g"
log "INFO" "Configuring DPDK $TAG1"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
+fixup_config
+
log "INFO" "Building DPDK $TAG1. This might take a moment"
make $MAKEJOBS O=$TARGET > $VERBOSE 2>&1
@@ -214,12 +214,12 @@ git reset --hard
log "INFO" "Checking out version $TAG2 of the dpdk"
git checkout $HASH2
-fixup_config
-
# Now configure the build
log "INFO" "Configuring DPDK $TAG2"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
+fixup_config
+
log "INFO" "Building DPDK $TAG2. This might take a moment"
make $MAKEJOBS O=$TARGET > $VERBOSE 2>&1
--
2.5.0
next prev parent reply other threads:[~2016-03-10 10:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 10:53 [dpdk-dev] [PATCH 1/3] scripts: support parallel building in validate-abi.sh via -j[N] option Panu Matilainen
2016-03-10 10:53 ` Panu Matilainen [this message]
2016-03-10 12:25 ` [dpdk-dev] [PATCH 2/3] scripts: avoid editing defconfig_* files in validate-abi.sh Ferruh Yigit
2016-03-10 12:36 ` Panu Matilainen
2016-03-10 10:53 ` [dpdk-dev] [PATCH 3/3] scripts: ignore self-generated directories in validate-abi startup check Panu Matilainen
2016-03-10 12:22 ` Ferruh Yigit
2016-03-10 12:29 ` Panu Matilainen
2016-03-10 12:34 ` Ferruh Yigit
2016-03-10 12:39 ` Panu Matilainen
2016-03-10 12:47 ` Ferruh Yigit
2016-03-10 12:52 ` [dpdk-dev] [PATCH 1/3] scripts: support parallel building in validate-abi.sh via -j[N] option Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e7fcffec863b7f60cf62707b3be3dd81a5de991.1457607217.git.pmatilai@redhat.com \
--to=pmatilai@redhat.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).