From 4f3ec022300a62aba512f2aee7522a902c107c2d Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Tue, 9 Aug 2016 15:41:11 +0800 Subject: [PATCH] Rebase to OVS with DPDk 16.07 Change-Id: I47e19e5cf06b117c915ff1ed7bc69d70feef593b Signed-off-by: Guo Ruijing --- deployment_scripts/install.sh | 4 ++-- ovs_build/build-ovs-dpdk.sh | 10 +++++----- ovs_build/dpdk_16.04/debian/changelog | 3 --- ovs_build/dpdk_16.07/debian/changelog | 3 +++ ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/compat | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/control | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/copyright | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk-dev.dirs | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk-dev.install | 0 .../debian/dpdk-doc.README.Debian | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk-doc.dirs | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-init | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk-sdk-env.sh | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.conf | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.dirs | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.init | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk.install | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk.interfaces | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/dpdk.service | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/libdpdk-dev.dirs | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/libdpdk0.dirs | 0 .../debian/libdpdk0.symbols.amd64 | 0 .../debian/libdpdk0.symbols.i386 | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/patches/series | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/rules | 2 +- .../{dpdk_16.04 => dpdk_16.07}/debian/source/format | 0 .../debian/tests/check-dpdk-supported-arch.sh | 0 .../{dpdk_16.04 => dpdk_16.07}/debian/tests/control | 0 .../debian/tests/test-initscripts | 0 .../debian/tests/test-linkage | 0 ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/watch | 0 31 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 ovs_build/dpdk_16.04/debian/changelog create mode 100644 ovs_build/dpdk_16.07/debian/changelog rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/compat (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/control (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/copyright (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-dev.dirs (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-dev.install (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-doc.README.Debian (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-doc.dirs (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-init (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk-sdk-env.sh (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.conf (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.dirs (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.init (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.install (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.interfaces (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/dpdk.service (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/libdpdk-dev.dirs (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/libdpdk0.dirs (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/libdpdk0.symbols.amd64 (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/libdpdk0.symbols.i386 (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/patches/series (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/rules (99%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/source/format (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/tests/check-dpdk-supported-arch.sh (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/tests/control (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/tests/test-initscripts (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/tests/test-linkage (100%) rename ovs_build/{dpdk_16.04 => dpdk_16.07}/debian/watch (100%) diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh index 8d20628..ad9cbd8 100644 --- a/deployment_scripts/install.sh +++ b/deployment_scripts/install.sh @@ -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 diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh index a940113..aeb5eb7 100755 --- a/ovs_build/build-ovs-dpdk.sh +++ b/ovs_build/build-ovs-dpdk.sh @@ -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 \ diff --git a/ovs_build/dpdk_16.04/debian/changelog b/ovs_build/dpdk_16.04/debian/changelog deleted file mode 100644 index 090d100..0000000 --- a/ovs_build/dpdk_16.04/debian/changelog +++ /dev/null @@ -1,3 +0,0 @@ -dpdk (16.04-1) unstable; urgency=low - * DPDK 16.04 - -- DPDK team diff --git a/ovs_build/dpdk_16.07/debian/changelog b/ovs_build/dpdk_16.07/debian/changelog new file mode 100644 index 0000000..50a7491 --- /dev/null +++ b/ovs_build/dpdk_16.07/debian/changelog @@ -0,0 +1,3 @@ +dpdk (16.07-1) unstable; urgency=low + * DPDK 16.07 + -- DPDK team diff --git a/ovs_build/dpdk_16.04/debian/compat b/ovs_build/dpdk_16.07/debian/compat similarity index 100% rename from ovs_build/dpdk_16.04/debian/compat rename to ovs_build/dpdk_16.07/debian/compat diff --git a/ovs_build/dpdk_16.04/debian/control b/ovs_build/dpdk_16.07/debian/control similarity index 100% rename from ovs_build/dpdk_16.04/debian/control rename to ovs_build/dpdk_16.07/debian/control diff --git a/ovs_build/dpdk_16.04/debian/copyright b/ovs_build/dpdk_16.07/debian/copyright similarity index 100% rename from ovs_build/dpdk_16.04/debian/copyright rename to ovs_build/dpdk_16.07/debian/copyright diff --git a/ovs_build/dpdk_16.04/debian/dpdk-dev.dirs b/ovs_build/dpdk_16.07/debian/dpdk-dev.dirs similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-dev.dirs rename to ovs_build/dpdk_16.07/debian/dpdk-dev.dirs diff --git a/ovs_build/dpdk_16.04/debian/dpdk-dev.install b/ovs_build/dpdk_16.07/debian/dpdk-dev.install similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-dev.install rename to ovs_build/dpdk_16.07/debian/dpdk-dev.install diff --git a/ovs_build/dpdk_16.04/debian/dpdk-doc.README.Debian b/ovs_build/dpdk_16.07/debian/dpdk-doc.README.Debian similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-doc.README.Debian rename to ovs_build/dpdk_16.07/debian/dpdk-doc.README.Debian diff --git a/ovs_build/dpdk_16.04/debian/dpdk-doc.dirs b/ovs_build/dpdk_16.07/debian/dpdk-doc.dirs similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-doc.dirs rename to ovs_build/dpdk_16.07/debian/dpdk-doc.dirs diff --git a/ovs_build/dpdk_16.04/debian/dpdk-init b/ovs_build/dpdk_16.07/debian/dpdk-init similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-init rename to ovs_build/dpdk_16.07/debian/dpdk-init diff --git a/ovs_build/dpdk_16.04/debian/dpdk-sdk-env.sh b/ovs_build/dpdk_16.07/debian/dpdk-sdk-env.sh similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk-sdk-env.sh rename to ovs_build/dpdk_16.07/debian/dpdk-sdk-env.sh diff --git a/ovs_build/dpdk_16.04/debian/dpdk.conf b/ovs_build/dpdk_16.07/debian/dpdk.conf similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.conf rename to ovs_build/dpdk_16.07/debian/dpdk.conf diff --git a/ovs_build/dpdk_16.04/debian/dpdk.dirs b/ovs_build/dpdk_16.07/debian/dpdk.dirs similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.dirs rename to ovs_build/dpdk_16.07/debian/dpdk.dirs diff --git a/ovs_build/dpdk_16.04/debian/dpdk.init b/ovs_build/dpdk_16.07/debian/dpdk.init similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.init rename to ovs_build/dpdk_16.07/debian/dpdk.init diff --git a/ovs_build/dpdk_16.04/debian/dpdk.install b/ovs_build/dpdk_16.07/debian/dpdk.install similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.install rename to ovs_build/dpdk_16.07/debian/dpdk.install diff --git a/ovs_build/dpdk_16.04/debian/dpdk.interfaces b/ovs_build/dpdk_16.07/debian/dpdk.interfaces similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.interfaces rename to ovs_build/dpdk_16.07/debian/dpdk.interfaces diff --git a/ovs_build/dpdk_16.04/debian/dpdk.service b/ovs_build/dpdk_16.07/debian/dpdk.service similarity index 100% rename from ovs_build/dpdk_16.04/debian/dpdk.service rename to ovs_build/dpdk_16.07/debian/dpdk.service diff --git a/ovs_build/dpdk_16.04/debian/libdpdk-dev.dirs b/ovs_build/dpdk_16.07/debian/libdpdk-dev.dirs similarity index 100% rename from ovs_build/dpdk_16.04/debian/libdpdk-dev.dirs rename to ovs_build/dpdk_16.07/debian/libdpdk-dev.dirs diff --git a/ovs_build/dpdk_16.04/debian/libdpdk0.dirs b/ovs_build/dpdk_16.07/debian/libdpdk0.dirs similarity index 100% rename from ovs_build/dpdk_16.04/debian/libdpdk0.dirs rename to ovs_build/dpdk_16.07/debian/libdpdk0.dirs diff --git a/ovs_build/dpdk_16.04/debian/libdpdk0.symbols.amd64 b/ovs_build/dpdk_16.07/debian/libdpdk0.symbols.amd64 similarity index 100% rename from ovs_build/dpdk_16.04/debian/libdpdk0.symbols.amd64 rename to ovs_build/dpdk_16.07/debian/libdpdk0.symbols.amd64 diff --git a/ovs_build/dpdk_16.04/debian/libdpdk0.symbols.i386 b/ovs_build/dpdk_16.07/debian/libdpdk0.symbols.i386 similarity index 100% rename from ovs_build/dpdk_16.04/debian/libdpdk0.symbols.i386 rename to ovs_build/dpdk_16.07/debian/libdpdk0.symbols.i386 diff --git a/ovs_build/dpdk_16.04/debian/patches/series b/ovs_build/dpdk_16.07/debian/patches/series similarity index 100% rename from ovs_build/dpdk_16.04/debian/patches/series rename to ovs_build/dpdk_16.07/debian/patches/series diff --git a/ovs_build/dpdk_16.04/debian/rules b/ovs_build/dpdk_16.07/debian/rules similarity index 99% rename from ovs_build/dpdk_16.04/debian/rules rename to ovs_build/dpdk_16.07/debian/rules index f2f5a17..e5b9499 100755 --- a/ovs_build/dpdk_16.04/debian/rules +++ b/ovs_build/dpdk_16.07/debian/rules @@ -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) diff --git a/ovs_build/dpdk_16.04/debian/source/format b/ovs_build/dpdk_16.07/debian/source/format similarity index 100% rename from ovs_build/dpdk_16.04/debian/source/format rename to ovs_build/dpdk_16.07/debian/source/format diff --git a/ovs_build/dpdk_16.04/debian/tests/check-dpdk-supported-arch.sh b/ovs_build/dpdk_16.07/debian/tests/check-dpdk-supported-arch.sh similarity index 100% rename from ovs_build/dpdk_16.04/debian/tests/check-dpdk-supported-arch.sh rename to ovs_build/dpdk_16.07/debian/tests/check-dpdk-supported-arch.sh diff --git a/ovs_build/dpdk_16.04/debian/tests/control b/ovs_build/dpdk_16.07/debian/tests/control similarity index 100% rename from ovs_build/dpdk_16.04/debian/tests/control rename to ovs_build/dpdk_16.07/debian/tests/control diff --git a/ovs_build/dpdk_16.04/debian/tests/test-initscripts b/ovs_build/dpdk_16.07/debian/tests/test-initscripts similarity index 100% rename from ovs_build/dpdk_16.04/debian/tests/test-initscripts rename to ovs_build/dpdk_16.07/debian/tests/test-initscripts diff --git a/ovs_build/dpdk_16.04/debian/tests/test-linkage b/ovs_build/dpdk_16.07/debian/tests/test-linkage similarity index 100% rename from ovs_build/dpdk_16.04/debian/tests/test-linkage rename to ovs_build/dpdk_16.07/debian/tests/test-linkage diff --git a/ovs_build/dpdk_16.04/debian/watch b/ovs_build/dpdk_16.07/debian/watch similarity index 100% rename from ovs_build/dpdk_16.04/debian/watch rename to ovs_build/dpdk_16.07/debian/watch