Browse Source

Merge "AArch64: Add native build support"

tags/10.0-eol
Jenkins 2 years ago
parent
commit
ead29f4f3f

+ 16
- 23
deployment_scripts/install.sh View File

@@ -11,32 +11,23 @@ dpdk=$3
11 11
 dpdk_socket_mem=${4:-''}
12 12
 pmd_cpu_mask=${5:-'2'}
13 13
 
14
+ovs="ovs-dpdk.tar.gz"
15
+if [ $nsh = 'true' ]; then
16
+    ovs="ovs-nsh-dpdk.tar.gz"
17
+fi
18
+
14 19
 apt-get install -y --allow-unauthenticated dkms
15 20
 
16
-if [ $nsh = 'true' ]
21
+curl  http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/${ovs} | tar -xzv
22
+dpkg -i openvswitch-datapath-dkms_*.deb
23
+dpkg -i openvswitch-common_*.deb
24
+dpkg -i openvswitch-switch_*.deb
25
+dpkg -i python-openvswitch_*.deb
26
+
27
+if [ $dpdk = 'true' ]
17 28
 then
18
-    curl  http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
19
-    dpkg -i openvswitch-datapath-dkms_2.6.1-1.nsh_all.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
28
-else
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
29
+    apt-get install -y --allow-unauthenticated dpdk dpdk-dev dpdk-dkms
30
+    dpkg -i openvswitch-switch-dpdk_*.deb
40 31
 fi
41 32
 
42 33
 if [[ $dpdk = 'true' && -n $dpdk_socket_mem ]]
@@ -51,3 +42,5 @@ then
51 42
 
52 43
     service openvswitch-switch restart
53 44
 fi
45
+
46
+rm -rf $INSTALL_HOME

+ 1
- 1
ovs_build/build-ovs-dpdk.sh View File

@@ -26,7 +26,7 @@ dpdk (16.07-0ubuntu5~u1604+fuel10) xenial; urgency=low
26 26
   * Rebuild debian package
27 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)
30 30
 EOF
31 31
 
32 32
 # copy from debian/control

+ 1
- 1
ovs_build/build-ovs-nsh-dpdk.sh View File

@@ -26,7 +26,7 @@ dpdk (16.07-0ubuntu5~u1604+fuel10) xenial; urgency=low
26 26
   * Rebuild debian package
27 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)
30 30
 EOF
31 31
 
32 32
 # copy from debian/control

+ 1
- 1
ovs_build/openvswitch_2.6-dpdk_16.07/debian/control View File

@@ -27,7 +27,7 @@ Homepage: http://openvswitch.org/
27 27
 XS-Testsuite: autopkgtest
28 28
 
29 29
 Package: openvswitch-switch-dpdk
30
-Architecture: i386 amd64
30
+Architecture: i386 amd64 arm64
31 31
 Depends: dpdk,
32 32
          openvswitch-switch (>= 2.4.0),
33 33
          ${misc:Depends},

+ 6
- 0
pre_build_hook View File

@@ -3,9 +3,15 @@
3 3
 set -eux
4 4
 
5 5
 BUILD_FOR=${BUILD_FOR:-ubuntu}
6
+BUILD_ARCH="$(dpkg --print-architecture)"
6 7
 DIR="$(dirname `readlink -f $0`)"
7 8
 
8 9
 function 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 15
   case $1 in
10 16
     ubuntu)
11 17
       rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu

Loading…
Cancel
Save