Merge "Rebase to OVS with DPDk 16.07"

This commit is contained in:
Jenkins 2016-08-09 07:52:44 +00:00 committed by Gerrit Code Review
commit a4b36af636
31 changed files with 11 additions and 11 deletions

View File

@ -33,8 +33,8 @@ else
if [ $dpdk = 'true' ]
then
dpkg -i libxenstore3.0*.deb
dpkg -i libdpdk0_16.04-1_amd64.deb
dpkg -i dpdk_16.04-1_amd64.deb
dpkg -i libdpdk0_16.07-1_amd64.deb
dpkg -i dpdk_16.07-1_amd64.deb
dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
fi
fi

View File

@ -2,7 +2,7 @@
set -eux
OVS_COMMIT=7d8eadce4df70f563a0c0123c612f6117c8ff864
OVS_COMMIT=9f4ecd654dbcb88b15a424445184591fc887537e
URL_OVS=https://github.com/openvswitch/ovs.git
BUILD_DEB=${BUILD_DEB:-/deb}
BUILD_SRC="$(dirname `readlink -f $0`)"
@ -15,10 +15,10 @@ sudo apt-get -y install devscripts dpkg-dev git wget
rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST}
cd ${BUILD_DEST}
wget -c http://fast.dpdk.org/rel/dpdk-16.04.tar.xz
xz -d dpdk-16.04.tar.xz; tar xvf dpdk-16.04.tar
cd dpdk-16.04
cp -r ${BUILD_SRC}/dpdk_16.04/debian .
wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
cd dpdk-16.07
cp -r ${BUILD_SRC}/dpdk_16.07/debian .
# copy from debian/control
sudo apt-get install -y debhelper \

View File

@ -1,3 +0,0 @@
dpdk (16.04-1) unstable; urgency=low
* DPDK 16.04
-- DPDK team <dev@dpdk.org>

View File

@ -0,0 +1,3 @@
dpdk (16.07-1) unstable; urgency=low
* DPDK 16.07
-- DPDK team <dev@dpdk.org>

View File

@ -101,7 +101,7 @@ binary-arch:
$(MAKE) O=$(DPDK_SHARED_DIR) prefix=/usr \
DESTDIR=debian/dpdk install-runtime
cp debian/dpdk.interfaces debian/dpdk/etc/dpdk/interfaces
rm debian/dpdk/usr/sbin/dpdk_nic_bind
#rm debian/dpdk/usr/sbin/dpdk_nic_bind
ln -s /usr/share/dpdk/tools/dpdk_nic_bind.py \
debian/dpdk/sbin/dpdk_nic_bind
# Package: libdpdk0 (bare runtime libs)