Fix for new location of OVS and DPDK COPR repos.

Change-Id: Ibee81cbee778bb1b542317ed41b94d01f86426bc
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index fc1d7de..1812dc3 100755 (executable)
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -87,8 +87,8 @@ 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
-cd dpdk
+git clone https://github.com/tfherbert/dpdk-snap.git
+cd dpdk-snap
 git checkout $COPR_DPDK_VERSION
 
 echo "---------------------"
@@ -102,12 +102,12 @@ 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`

diff --git a/build/build_ovs_rpm.sh b/build/build_ovs_rpm.sh
index de46177..b03f4ab 100755 (executable)
--- a/build/build_ovs_rpm.sh
+++ b/build/build_ovs_rpm.sh
@@ -123,12 +123,12 @@ if [ ! -z $DPDK ]; then
     echo "----------------------------------"
     echo "Clone Fedora copr repo and copy files."
     echo
-    git clone http://copr-dist-git.fedorainfracloud.org/cgit/pmatilai/dpdk-snapshot/openvswitch.git
-    cd openvswitch
+    git clone https://github.com/tfherbert/ovs-snap.git 
+    cd ovs-snap
     git checkout $COPR_OVS_VERSION
-    cp $TMPDIR/openvswitch/openvswitch.spec $RPMDIR/SPECS
-    cp $TMPDIR/openvswitch/* $RPMDIR/SOURCES
-    snapgit=`grep "define snapver" $TMPDIR/openvswitch/openvswitch.spec | cut -c26-33`
+    cp $TMPDIR/ovs-snap/openvswitch.spec $RPMDIR/SPECS
+    cp $TMPDIR/ovs-snap/* $RPMDIR/SOURCES
+    snapgit=`grep "define snapver" $TMPDIR/ovs-snap/openvswitch.spec | cut -c26-33`
     echo "-------------------------------------------"
     echo "Remove old dpdk, ovs and dpdk development rpms"
     echo
@@ -161,7 +161,7 @@ if [ ! -z $DPDK ]; then
     prefix=openvswitch-${basever}
     archive=${prefix}-${snapser}.git${snapgit}.tar.gz
     git archive --prefix=${prefix}-${snapser}.git${snapgit}/ HEAD  | gzip -9 > $RPMDIR/SOURCES/${archive}
-    cd $TMPDIR/openvswitch
+    cd $TMPDIR/ovs-snap
     echo "--------------------------------------------"
     echo "Build openvswitch RPM"
     echo

diff --git a/build/config b/build/config
index 40d8a23..350b192 100644 (file)
--- a/build/config
+++ b/build/config
@@ -37,8 +37,8 @@ export PATCH=none
 export WITH_DPDK=yes
 export DPDK_PATCH=none
 export DPDK_VERSION=16.04-rc4
-export COPR_DPDK_VERSION=b0ffc82446b72b7e950c0d8c74d942704ec7aa68
-export COPR_OVS_VERSION=25179223d133d87569d169c60f72d9707eb486c5
+export COPR_DPDK_VERSION=039002f07eb1dd96a061235f0bf0493da386bba2
+export COPR_OVS_VERSION=5e311e125035edc706efbd9cc679f67e5972dbb4 
 #
 # When KMOD is set, the Linux kernel module is built and tested.
 #