X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fbuild_dpdk_rpm.sh;h=f088a4ac0fba848d16c4defdeb704771659588e5;hb=12f2ef7179358be329abfbee59e0663a5be3418e;hp=a36403d82fd48972398ca8de7763d931ed37006c;hpb=e6eee91433297cc61314412bf7b81c969f806aeb;p=ovsnfv.git

diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index a36403d..f088a4a 100755
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -61,18 +61,21 @@ 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
 
 cd $TMPDIR
 
+install_pre_reqs
+
 mkdir -p $HOME/rpmbuild/RPMS
 mkdir -p $HOME/rpmbuild/SOURCES
 mkdir -p $HOME/rpmbuild/SPECS
@@ -87,7 +90,17 @@ echo "---------------------"
 echo "Get copr distribution git"
 mkdir -p copr
 cd copr
-git clone http://copr-dist-git.fedorainfracloud.org/cgit/pmatilai/dpdk/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 +113,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
 archive=${prefix}.tar.gz
 DPDK_VERSION=$basever
 
@@ -125,6 +138,13 @@ echo building RPM for DPDK version $DPDK_VERSION
 echo
 rpmbuild -bb --define "_topdir $RPMDIR" dpdk.spec
 
+echo "-------------------------------"
+echo Delete all rpms from $HOME
+echo
+set +e
+rm $HOME/*.rpm
+set -e
+
 echo "-------------------------------"
 echo Copy dpdk RPM
 echo