diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2016-04-30 10:56:19 -0400 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2016-04-30 12:27:10 -0400 |
| commit | e8a95dc2a8c7aac0277da8a3da530a7907bfdd1d (patch) | |
| tree | 42b8a88de9a9099f9ce47dcfa1caf43028f69b91 | |
| parent | fe0d98cb53b7ce4b116c0f557376afe326698226 (diff) | |
Fix build problem by freezing copr commits
Use correct variable for copr dpdk version
Change-Id: I09c5e7060924771a75376aebe5bf3bde897c38eb
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rwxr-xr-x | build/build_dpdk_rpm.sh | 2 | ||||
| -rwxr-xr-x | build/build_ovs_rpm.sh | 2 | ||||
| -rw-r--r-- | build/config | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh index 5118826..fc1d7de 100755 --- a/build/build_dpdk_rpm.sh +++ b/build/build_dpdk_rpm.sh @@ -88,6 +88,8 @@ 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 checkout $COPR_DPDK_VERSION echo "---------------------" echo "Build DPDK RPM version $DPDK_VERSION" diff --git a/build/build_ovs_rpm.sh b/build/build_ovs_rpm.sh index 198d43b..de46177 100755 --- a/build/build_ovs_rpm.sh +++ b/build/build_ovs_rpm.sh @@ -124,6 +124,8 @@ if [ ! -z $DPDK ]; then 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 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` diff --git a/build/config b/build/config index 73a2293..40d8a23 100644 --- a/build/config +++ b/build/config @@ -37,6 +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 # # When KMOD is set, the Linux kernel module is built and tested. # |