Fix for new location of OVS and DPDK COPR repos.

[ovsnfv.git] / build / build_dpdk_rpm.sh

diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index a36403d..1812dc3 100755 (executable)
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -87,7 +87,9 @@ 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 "Build DPDK RPM version $DPDK_VERSION"
@@ -100,18 +102,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 +127,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