summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-03 00:18:01 +0000
committerGerrit Code Review <review@openstack.org>2017-02-03 00:18:01 +0000
commitead29f4f3ffa13cbfe1049ee015ca7681a2bd474 (patch)
treea18f5eafbb3e812bd033bcc58b06ef3f8a7798f5
parent1738bd1b18309b376991ce234e4894be7196e264 (diff)
parentcf242248084333a92b3ffd9356b1535cc4a7fa43 (diff)
Merge "AArch64: Add native build support"
-rw-r--r--deployment_scripts/install.sh39
-rwxr-xr-xovs_build/build-ovs-dpdk.sh2
-rwxr-xr-xovs_build/build-ovs-nsh-dpdk.sh2
-rw-r--r--ovs_build/openvswitch_2.6-dpdk_16.07/debian/control2
-rwxr-xr-xpre_build_hook6
5 files changed, 25 insertions, 26 deletions
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index 4a22685..821668d 100644
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -11,32 +11,23 @@ dpdk=$3
11dpdk_socket_mem=${4:-''} 11dpdk_socket_mem=${4:-''}
12pmd_cpu_mask=${5:-'2'} 12pmd_cpu_mask=${5:-'2'}
13 13
14ovs="ovs-dpdk.tar.gz"
15if [ $nsh = 'true' ]; then
16 ovs="ovs-nsh-dpdk.tar.gz"
17fi
18
14apt-get install -y --allow-unauthenticated dkms 19apt-get install -y --allow-unauthenticated dkms
15 20
16if [ $nsh = 'true' ] 21curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/${ovs} | tar -xzv
22dpkg -i openvswitch-datapath-dkms_*.deb
23dpkg -i openvswitch-common_*.deb
24dpkg -i openvswitch-switch_*.deb
25dpkg -i python-openvswitch_*.deb
26
27if [ $dpdk = 'true' ]
17then 28then
18 curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv 29 apt-get install -y --allow-unauthenticated dpdk dpdk-dev dpdk-dkms
19 dpkg -i openvswitch-datapath-dkms_2.6.1-1.nsh_all.deb 30 dpkg -i openvswitch-switch-dpdk_*.deb
20 dpkg -i openvswitch-common_2.6.1-1.nsh_amd64.deb
21 dpkg -i openvswitch-switch_2.6.1-1.nsh_amd64.deb
22 dpkg -i python-openvswitch_2.6.1-1.nsh_all.deb
23 if [ $dpdk = 'true' ]
24 then
25 apt-get install -y --allow-unauthenticated dpdk dpdk-dev dpdk-dkms
26 dpkg -i openvswitch-switch-dpdk_2.6.1-1.nsh_amd64.deb
27 fi
28else
29 curl http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv
30 dpkg -i openvswitch-datapath-dkms_2.6.90-1_all.deb
31 dpkg -i openvswitch-common_2.6.90-1_amd64.deb
32 dpkg -i openvswitch-switch_2.6.90-1_amd64.deb
33 dpkg -i python-openvswitch_2.6.90-1_all.deb
34 if [ $dpdk = 'true' ]
35 then
36 apt-get install -y --allow-unauthenticated dpdk dpdk-dev dpdk-dkms
37 dpkg -i openvswitch-switch-dpdk_2.6.90-1_amd64.deb
38
39 fi
40fi 31fi
41 32
42if [[ $dpdk = 'true' && -n $dpdk_socket_mem ]] 33if [[ $dpdk = 'true' && -n $dpdk_socket_mem ]]
@@ -51,3 +42,5 @@ then
51 42
52 service openvswitch-switch restart 43 service openvswitch-switch restart
53fi 44fi
45
46rm -rf $INSTALL_HOME
diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
index 311c6c6..678c739 100755
--- a/ovs_build/build-ovs-dpdk.sh
+++ b/ovs_build/build-ovs-dpdk.sh
@@ -26,7 +26,7 @@ dpdk (16.07-0ubuntu5~u1604+fuel10) xenial; urgency=low
26 * Rebuild debian package 26 * Rebuild debian package
27 * update librte-eal2.symbols 27 * update librte-eal2.symbols
28 28
29 -- Ruijing Guo <ruijing.guo@intel.com> $(date --rfc-2822) 29 -- Ruijing Guo <ruijing.guo@intel.com> $(date --rfc-2822)
30EOF 30EOF
31 31
32# copy from debian/control 32# copy from debian/control
diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
index 3c4ca45..37a9d33 100755
--- a/ovs_build/build-ovs-nsh-dpdk.sh
+++ b/ovs_build/build-ovs-nsh-dpdk.sh
@@ -26,7 +26,7 @@ dpdk (16.07-0ubuntu5~u1604+fuel10) xenial; urgency=low
26 * Rebuild debian package 26 * Rebuild debian package
27 * update librte-eal2.symbols 27 * update librte-eal2.symbols
28 28
29 -- Ruijing Guo <ruijing.guo@intel.com> $(date --rfc-2822) 29 -- Ruijing Guo <ruijing.guo@intel.com> $(date --rfc-2822)
30EOF 30EOF
31 31
32# copy from debian/control 32# copy from debian/control
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
index e7171b9..e0c27c5 100644
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
+++ b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
@@ -27,7 +27,7 @@ Homepage: http://openvswitch.org/
27XS-Testsuite: autopkgtest 27XS-Testsuite: autopkgtest
28 28
29Package: openvswitch-switch-dpdk 29Package: openvswitch-switch-dpdk
30Architecture: i386 amd64 30Architecture: i386 amd64 arm64
31Depends: dpdk, 31Depends: dpdk,
32 openvswitch-switch (>= 2.4.0), 32 openvswitch-switch (>= 2.4.0),
33 ${misc:Depends}, 33 ${misc:Depends},
diff --git a/pre_build_hook b/pre_build_hook
index 43b5936..194a7b9 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -3,9 +3,15 @@
3set -eux 3set -eux
4 4
5BUILD_FOR=${BUILD_FOR:-ubuntu} 5BUILD_FOR=${BUILD_FOR:-ubuntu}
6BUILD_ARCH="$(dpkg --print-architecture)"
6DIR="$(dirname `readlink -f $0`)" 7DIR="$(dirname `readlink -f $0`)"
7 8
8function build_pkg { 9function build_pkg {
10 case ${BUILD_ARCH} in
11 arm64)
12 sed -i -e "s|FROM ubuntu|FROM aarch64/ubuntu|g" ovs_build/Dockerfile
13 ;;
14 esac
9 case $1 in 15 case $1 in
10 ubuntu) 16 ubuntu)
11 rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu 17 rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu