summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-12-25 17:54:25 -0500
committerGuo Ruijing <ruijing.guo@intel.com>2016-12-27 17:05:04 -0500
commit199e239e85803ad6bfe21c60e2f2d4f24e9cf4b4 (patch)
treeb1a5e569efadd36a6f77d294e6684913a5dc0a7e
parent0ee71f2de57957f43d4ed441ee01191c05291cac (diff)
ovs rebase and add ovs with NSH/DPDK
1. rebase to ovs commit 92043ab8ffd449dfd50c3e716d6db06d04af70d7 2. add DPDK for ovs with NSH 3. clean up later for easy code review a) change openvswitch-dpdk_2.5.90 to openvswitch_2.6-dpdk_16.07 a) delete dpdk_2.2.0 b) delete openvswitch-nsh-dpdk_2.5.90 Change-Id: I4d8b16a1c2517dba2b9356e6436885b65ac4b307 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+1: Michael Polenchuk <mpolenchuk@mirantis.com> Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 29 Dec 2016 00:30:03 +0000 Reviewed-on: https://review.openstack.org/414847 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rwxr-xr-xovs_build/build-ovs-dpdk.sh31
-rwxr-xr-xovs_build/build-ovs-nsh-dpdk.sh67
-rw-r--r--ovs_build/openvswitch-dpdk_2.5.90/debian/changelog3
3 files changed, 74 insertions, 27 deletions
diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
index aeb5eb7..86225c5 100755
--- a/ovs_build/build-ovs-dpdk.sh
+++ b/ovs_build/build-ovs-dpdk.sh
@@ -2,19 +2,19 @@
2 2
3set -eux 3set -eux
4 4
5OVS_COMMIT=9f4ecd654dbcb88b15a424445184591fc887537e 5OVS_COMMIT=92043ab8ffd449dfd50c3e716d6db06d04af70d7
6URL_OVS=https://github.com/openvswitch/ovs.git 6OVS_VER=${OVS_VER:-2.6.90}
7BUILD_DEB=${BUILD_DEB:-/deb} 7BUILD_DEST=${BUILD_DEST:-/deb}
8BUILD_SRC="$(dirname `readlink -f $0`)" 8BUILD_SRC="$(dirname `readlink -f $0`)"
9BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk} 9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
10 10
11export DEB_BUILD_OPTIONS='parallel=8 nocheck' 11export DEB_BUILD_OPTIONS='parallel=8 nocheck'
12 12
13sudo apt-get -y install devscripts dpkg-dev git wget 13sudo apt-get -y install devscripts dpkg-dev git wget
14 14
15rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST} 15rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}
16 16
17cd ${BUILD_DEST} 17cd ${BUILD_HOME}
18wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz 18wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
19xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar 19xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
20cd dpdk-16.07 20cd dpdk-16.07
@@ -37,11 +37,10 @@ sudo apt-get install -y debhelper \
37 texlive-latex-extra 37 texlive-latex-extra
38debian/rules build; fakeroot debian/rules binary 38debian/rules build; fakeroot debian/rules binary
39 39
40cd ${BUILD_DEST} 40cd ${BUILD_HOME}
41sudo dpkg -i *.deb 41sudo dpkg -i *.deb
42apt-get download libxenstore3.0 42apt-get download libxenstore3.0
43 43
44sudo apt-get build-dep openvswitch -y
45# copy from debian/control 44# copy from debian/control
46sudo apt-get install -y autoconf \ 45sudo apt-get install -y autoconf \
47 automake \ 46 automake \
@@ -64,14 +63,22 @@ sudo apt-get install -y autoconf \
64 63
65git clone https://github.com/openvswitch/ovs.git 64git clone https://github.com/openvswitch/ovs.git
66cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git 65cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git
67cd ${BUILD_DEST}; cp -r ovs ovs-dpdk 66cd ${BUILD_HOME}; cp -r ovs ovs-dpdk
68 67
69cd ovs-dpdk 68cd ovs-dpdk
70cp -r ${BUILD_SRC}/openvswitch-dpdk_2.5.90/debian . 69cp -r ${BUILD_SRC}/openvswitch-dpdk_2.5.90/debian .
70cat << EOF > debian/changelog
71openvswitch-dpdk (${OVS_VER}-1) unstable; urgency=low
72 [ Open vSwitch team ]
73 * support OVS with DPDK 16.07
74
75 -- Open vSwitch team <dev@openvswitch.org> $(date --rfc-2822)
76EOF
77
71debian/rules build; fakeroot debian/rules binary 78debian/rules build; fakeroot debian/rules binary
72 79
73cd ${BUILD_DEST}/ovs 80cd ${BUILD_HOME}/ovs
74debian/rules build; fakeroot debian/rules binary 81debian/rules build; fakeroot debian/rules binary
75 82
76cp -r ${BUILD_DEST}/*.deb ${BUILD_DEB} 83cp -r ${BUILD_HOME}/*.deb ${BUILD_DEST}
77rm -rf ${BUILD_DEST} 84rm -rf ${BUILD_HOME}
diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
index f80d081..11dce5d 100755
--- a/ovs_build/build-ovs-nsh-dpdk.sh
+++ b/ovs_build/build-ovs-nsh-dpdk.sh
@@ -3,11 +3,10 @@
3set -eux 3set -eux
4 4
5OVS_COMMIT=f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3 5OVS_COMMIT=f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3
6URL_OVS=https://github.com/openvswitch/ovs.git
7OVS_VER=${OVS_VER:-2.6.1} 6OVS_VER=${OVS_VER:-2.6.1}
8BUILD_HOME=$HOME/nsh
9BUILD_DEST=${BUILD_DEST:-/deb} 7BUILD_DEST=${BUILD_DEST:-/deb}
10DIR="$(dirname `readlink -f $0`)" 8BUILD_SRC="$(dirname `readlink -f $0`)"
9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
11 10
12export DEB_BUILD_OPTIONS='parallel=8 nocheck' 11export DEB_BUILD_OPTIONS='parallel=8 nocheck'
13 12
@@ -16,38 +15,82 @@ sudo apt-get -y install devscripts dpkg-dev git wget
16rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME} 15rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}
17 16
18cd ${BUILD_HOME} 17cd ${BUILD_HOME}
18wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
19xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
20cd dpdk-16.07
21cp -r ${BUILD_SRC}/dpdk_16.07/debian .
19 22
20# copy from debian/control 23# copy from debian/control
21sudo apt-get install -y \ 24sudo apt-get install -y debhelper \
22 graphviz \ 25 dh-python \
23 autoconf \ 26 dh-systemd \
27 doxygen \
28 graphviz \
29 inkscape \
30 libcap-dev \
31 libpcap-dev \
32 libxen-dev \
33 libxenstore3.0 \
34 python \
35 python-sphinx \
36 texlive-fonts-recommended \
37 texlive-latex-extra
38debian/rules build; fakeroot debian/rules binary
39
40cd ${BUILD_HOME}
41sudo dpkg -i *.deb
42apt-get download libxenstore3.0
43
44# copy from debian/control
45sudo apt-get install -y autoconf \
24 automake \ 46 automake \
25 bzip2 \ 47 bzip2 \
26 debhelper \ 48 debhelper \
27 dh-autoreconf \ 49 dh-autoreconf \
50 dh-systemd \
51 graphviz \
52 libdpdk-dev \
53 libfuse-dev \
28 libssl-dev \ 54 libssl-dev \
29 libtool \ 55 libtool \
30 openssl \ 56 openssl \
31 procps \ 57 procps \
32 python-all \ 58 python-all \
59 python-qt4 \
33 python-twisted-conch \ 60 python-twisted-conch \
34 python-zopeinterface \ 61 python-zopeinterface \
35 python-six 62 python-six
36 63
37git clone https://github.com/openvswitch/ovs.git 64git clone https://github.com/openvswitch/ovs.git
38cd ovs; git checkout ${OVS_COMMIT} 65cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git
39PATCHES=$(cd ${DIR}/ovs_nsh_patches/v2.6.1/; echo *patch) 66PATCHES=$(cd ${BUILD_SRC}/ovs_nsh_patches/v2.6.1/; echo *patch)
40for patch in ${PATCHES} 67for patch in ${PATCHES}
41do 68do
42 patch -p1 < ${DIR}/ovs_nsh_patches/v2.6.1/${patch} 69 patch -p1 < ${BUILD_SRC}/ovs_nsh_patches/v2.6.1/${patch}
43done 70done
71cd ${BUILD_HOME}; cp -r ovs ovs-dpdk
72
73cd ovs-dpdk
74cp -r ${BUILD_SRC}/openvswitch-dpdk_2.5.90/debian .
75cat << EOF > debian/changelog
76openvswitch-dpdk (${OVS_VER}-1.nsh) unstable; urgency=low
77 [ Open vSwitch team ]
78 * support NSH & DPDK 16.07
79
80 -- Open vSwitch team <dev@openvswitch.org> $(date --rfc-2822)
81EOF
82
83debian/rules build; fakeroot debian/rules binary
44 84
45# build ovs
46cd ${BUILD_HOME}/ovs 85cd ${BUILD_HOME}/ovs
47cat << EOF > debian/changelog 86cat << EOF > debian/changelog
48openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low 87openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
49 * Support NSH 88 [ Open vSwitch team ]
89 * support NSH
90
50 -- Open vSwitch team <dev@openvswitch.org> $(date --rfc-2822) 91 -- Open vSwitch team <dev@openvswitch.org> $(date --rfc-2822)
51EOF 92EOF
52debian/rules build; fakeroot debian/rules binary 93debian/rules build; fakeroot debian/rules binary
53cp ${BUILD_HOME}/*.deb ${BUILD_DEST} 94
95cp -r ${BUILD_HOME}/*.deb ${BUILD_DEST}
96rm -rf ${BUILD_HOME}
diff --git a/ovs_build/openvswitch-dpdk_2.5.90/debian/changelog b/ovs_build/openvswitch-dpdk_2.5.90/debian/changelog
deleted file mode 100644
index 796a6a1..0000000
--- a/ovs_build/openvswitch-dpdk_2.5.90/debian/changelog
+++ /dev/null
@@ -1,3 +0,0 @@
1openvswitch-dpdk (2.5.90-1) unstable; urgency=low
2 * New upstream version
3 -- Open vSwitch team <dev@openvswitch.org> Sat, 03 Sep 2016 20:00:00 +0200