X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fbuild_dpdk_rpm.sh;h=5da0e86ff1a890aff5296443bd7abdf00b7096d0;hb=a93ae78bf8aab5069f8c25a27c4c714215548c29;hp=04cf7a15c7399ce82936a8dd1968e779cc9d91dd;hpb=cbe1f7f40f5f60f9a8a0d2ed3c9ab3463f55bbc1;p=ovsnfv.git

diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index 04cf7a1..5da0e86 100755
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -61,13 +61,14 @@ then
     rm -rf $TMPDIR
 fi
 
-echo "---------------------"
-echo "Install dependencies for dpdk"
-echo
-sudo yum -y install gcc make python-devel openssl-devel autoconf automake rpm-build \
-            redhat-rpm-config libtool libpcap-devel numactl-devel python-sphinx \
-            libvirt-devel
-
+function install_pre_reqs() {
+    echo "----------------------------------------"
+    echo Install dependencies for dpdk.
+    echo
+    sudo yum -y install gcc make python-devel openssl-devel kernel-devel graphviz \
+                kernel-debug-devel autoconf automake rpm-build redhat-rpm-config \
+                libtool python-twisted-core desktop-file-utils groff PyQt4
+}
 
 mkdir -p $TMPDIR
 
@@ -87,7 +88,17 @@ echo "---------------------"
 echo "Get copr distribution git"
 mkdir -p copr
 cd copr
-git clone http://copr-dist-git.fedorainfracloud.org/cgit/pmatilai/dpdk-snapshot/dpdk.git
+git clone https://github.com/tfherbert/dpdk-snap.git
+cd dpdk-snap
+git checkout $COPR_DPDK_VERSION
+echo "---------------------"
+echo "Apply dpdk dpdk spec file patch"
+echo
+git apply $HOME/patches/spec_file_add_virtio_patch.patch
+echo "---------------------"
+echo "Copy in local dpdk patches"
+echo
+cp $HOME/patches/dpdk-16.04-virtio-devargs.patch $TMPDIR/copr/dpdk-snap
 
 echo "---------------------"
 echo "Build DPDK RPM version $DPDK_VERSION"
@@ -100,18 +111,18 @@ if [[ "$DPDK_VERSION" =~ "master" ]]; then
     snapgit=`git log --pretty=oneline -n1|cut -c1-8`
 else
     git checkout v$DPDK_VERSION
-    snapgit=`grep "define snapver" $TMPDIR/copr/dpdk/dpdk.spec | cut -c25-33`
+    snapgit=`grep "define snapver" $TMPDIR/copr/dpdk-snap/dpdk.spec | cut -c25-33`
 fi
 
-cp $TMPDIR/copr/dpdk/dpdk.spec $TMPDIR/dpdk
-cp $TMPDIR/copr/dpdk/dpdk.spec $RPMDIR/SPECS
-cp $TMPDIR/copr/dpdk/*.patch $TMPDIR/copr/dpdk/sources $TMPDIR/copr/dpdk/dpdk-snapshot.sh $RPMDIR/SOURCES
+cp $TMPDIR/copr/dpdk-snap/dpdk.spec $TMPDIR/dpdk
+cp $TMPDIR/copr/dpdk-snap/dpdk.spec $RPMDIR/SPECS
+cp $TMPDIR/copr/dpdk-snap/*.patch $TMPDIR/copr/dpdk-snap/sources $TMPDIR/copr/dpdk-snap/dpdk-snapshot.sh $RPMDIR/SOURCES
 snapser=`git log --pretty=oneline | wc -l`
 
 makever=`make showversion`
 basever=`echo ${makever} | cut -d- -f1`
+prefix=dpdk-${basever:0:5}
 
-prefix=dpdk-$basever-${snapser}.git${snapgit}
 archive=${prefix}.tar.gz
 DPDK_VERSION=$basever