[ovs-dev,1/2] travis: Do not patch dpdk sources.
diff mbox series

Message ID 1560331280-13588-1-git-send-email-david.marchand@redhat.com
State Superseded
Headers show
Series
  • [ovs-dev,1/2] travis: Do not patch dpdk sources.
Related show

Commit Message

David Marchand June 12, 2019, 9:21 a.m. UTC
Rather than patch the dpdk makefile and a template config file, we can
pass the -fPIC flag via EXTRA_CFLAGS.
This is more reliable than expecting the dpdk file names to be kept
unchanged.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
This patch applies on top of Ilya proposed change [1].

1: https://patchwork.ozlabs.org/patch/1113982/

---
 .travis/linux-build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

0-day Robot June 12, 2019, 9:55 a.m. UTC | #1
Bleep bloop.  Greetings David Marchand, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


git-am:
Failed to merge in the changes.
Patch failed at 0001 travis: Do not patch dpdk sources.
The copy of the patch that failed is found in:
   /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Please check this out.  If you feel there has been an error, please email aconole@bytheb.org

Thanks,
0-day Robot

Patch
diff mbox series

diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index b88bfb5..cd8cfcf 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -74,8 +74,6 @@  function install_dpdk()
         if [ $DIR_NAME != "dpdk-$1"  ]; then mv $DIR_NAME dpdk-$1; fi
         cd dpdk-$1
     fi
-    echo 'CONFIG_RTE_BUILD_FPIC=y' >>config/common_linuxapp
-    sed -ri '/EXECENV_CFLAGS  = -pthread -fPIC/{s/$/\nelse ifeq ($(CONFIG_RTE_BUILD_FPIC),y)/;s/$/\nEXECENV_CFLAGS  = -pthread -fPIC/}' mk/exec-env/linuxapp/rte.vars.mk
 
     make config CC=gcc T=$TARGET
 
@@ -88,7 +86,7 @@  function install_dpdk()
     sed -i '/CONFIG_RTE_EAL_IGB_UIO=y/s/=y/=n/' build/.config
     sed -i '/CONFIG_RTE_KNI_KMOD=y/s/=y/=n/' build/.config
 
-    make -j4 CC=gcc
+    make -j4 CC=gcc EXTRA_CFLAGS='-fPIC'
     echo "Installed DPDK source in $(pwd)"
     cd ..
 }