diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2016-04-10 00:56:02 -0400 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2016-04-11 08:04:29 -0400 |
| commit | cbe1f7f40f5f60f9a8a0d2ed3c9ab3463f55bbc1 (patch) | |
| tree | c753cd986a93407906dbb32ba45343cdf011db45 /build/build_ovs_rpm.sh | |
| parent | 5181fb94a7485af207c1232753eeb74fb8975b1a (diff) | |
Fixes RPM build problem. Use correct copr repo. Fix some version number parsing
and tarball and rpm naming that was specific to old repo and old DPDK version.
Now supports DPDK 16.04-rc4.
Change-Id: Ia64b38d676e945df27917f4d9aa90ba4872c8cb5
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Diffstat (limited to 'build/build_ovs_rpm.sh')
| -rwxr-xr-x | build/build_ovs_rpm.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/build/build_ovs_rpm.sh b/build/build_ovs_rpm.sh index 0eb6478..198d43b 100755 --- a/build/build_ovs_rpm.sh +++ b/build/build_ovs_rpm.sh @@ -123,7 +123,7 @@ 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/openvswitch.git + git clone http://copr-dist-git.fedorainfracloud.org/cgit/pmatilai/dpdk-snapshot/openvswitch.git cp $TMPDIR/openvswitch/openvswitch.spec $RPMDIR/SPECS cp $TMPDIR/openvswitch/* $RPMDIR/SOURCES snapgit=`grep "define snapver" $TMPDIR/openvswitch/openvswitch.spec | cut -c26-33` @@ -131,10 +131,14 @@ if [ ! -z $DPDK ]; then echo "Remove old dpdk, ovs and dpdk development rpms" echo cleanrpms + + if [ -z $DPDK_VERSION ]; then + DPDK_VERSION=16.04.0 + fi echo "-------------------------------------------" - echo "Install dpdk and dpdk development rpms" + echo "Install dpdk and dpdk development rpms for version $DPDK_VERSION" echo - sudo rpm -ivh $HOME/dpdk-2*.rpm + sudo rpm -ivh $HOME/dpdk-${DPDK_VERSION:0:1}*.rpm sudo rpm -ivh $HOME/dpdk-devel*.rpm echo "----------------------------------------" echo "Copy DPDK RPM to SOURCES" @@ -153,8 +157,8 @@ if [ ! -z $DPDK ]; then snapser=`git log --pretty=oneline | wc -l` basever=`grep AC_INIT configure.ac | cut -d' ' -f2 | cut -d, -f1` prefix=openvswitch-${basever} - archive=openvswitch-${basever}.tar.gz - git archive --prefix=${prefix}/ HEAD | gzip -9 > $RPMDIR/SOURCES/${archive} + archive=${prefix}-${snapser}.git${snapgit}.tar.gz + git archive --prefix=${prefix}-${snapser}.git${snapgit}/ HEAD | gzip -9 > $RPMDIR/SOURCES/${archive} cd $TMPDIR/openvswitch echo "--------------------------------------------" echo "Build openvswitch RPM" |