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>
echo "Get copr distribution git"
mkdir -p copr
cd copr
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 http://copr-dist-git.fedorainfracloud.org/cgit/pmatilai/dpdk-snapshot/dpdk.git
echo "---------------------"
echo "Build DPDK RPM version $DPDK_VERSION"
echo "---------------------"
echo "Build DPDK RPM version $DPDK_VERSION"
makever=`make showversion`
basever=`echo ${makever} | cut -d- -f1`
makever=`make showversion`
basever=`echo ${makever} | cut -d- -f1`
+prefix=dpdk-$basever-${snapser}.git${snapgit}
archive=${prefix}.tar.gz
DPDK_VERSION=$basever
archive=${prefix}.tar.gz
DPDK_VERSION=$basever
echo
rpmbuild -bb --define "_topdir $RPMDIR" dpdk.spec
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
echo "-------------------------------"
echo Copy dpdk RPM
echo
echo "----------------------------------"
echo "Clone Fedora copr repo and copy files."
echo
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`
cp $TMPDIR/openvswitch/openvswitch.spec $RPMDIR/SPECS
cp $TMPDIR/openvswitch/* $RPMDIR/SOURCES
snapgit=`grep "define snapver" $TMPDIR/openvswitch/openvswitch.spec | cut -c26-33`
echo "Remove old dpdk, ovs and dpdk development rpms"
echo
cleanrpms
echo "Remove old dpdk, ovs and dpdk development rpms"
echo
cleanrpms
+
+ if [ -z $DPDK_VERSION ]; then
+ DPDK_VERSION=16.04.0
+ fi
echo "-------------------------------------------"
echo "-------------------------------------------"
- echo "Install dpdk and dpdk development rpms"
+ echo "Install dpdk and dpdk development rpms for version $DPDK_VERSION"
- 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"
sudo rpm -ivh $HOME/dpdk-devel*.rpm
echo "----------------------------------------"
echo "Copy DPDK RPM to SOURCES"
snapser=`git log --pretty=oneline | wc -l`
basever=`grep AC_INIT configure.ac | cut -d' ' -f2 | cut -d, -f1`
prefix=openvswitch-${basever}
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"
cd $TMPDIR/openvswitch
echo "--------------------------------------------"
echo "Build openvswitch RPM"
#
export WITH_DPDK=yes
export DPDK_PATCH=none
#
export WITH_DPDK=yes
export DPDK_PATCH=none
-export DPDK_VERSION=2.2.0
+export DPDK_VERSION=16.04-rc4
#
# When KMOD is set, the Linux kernel module is built and tested.
#
#
# When KMOD is set, the Linux kernel module is built and tested.
#
cleanrpms
if [ ! -z $DPDK ]; then
cleanrpms
if [ ! -z $DPDK ]; then
+ if [ -z $DPDK_VERSION ]; then
+ DPDK_VERSION=16.04.0
+ fi
echo "-----------------------------------"
echo "-----------------------------------"
- echo "Install DPDK RPMs"
+ echo "Install DPDK RPMs for version $DPDK_VERSION"
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-2*.rpm
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-tools-2*.rpm
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-examples-2*.rpm
+ sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-${DPDK_VERSION:0:1}*.rpm
+ sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-tools-${DPDK_VERSION:0:1}*.rpm
+ sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-examples-${DPDK_VERSION:0:1}*.rpm
fi
if [ ! -z $kmod ]; then
fi
if [ ! -z $kmod ]; then