Browse Source

Merge "Multiarch: Arch-qualify DEB binary archives"

Jenkins 2 years ago
parent
commit
9b5292b244
3 changed files with 7 additions and 4 deletions
  1. 3
    2
      deployment_scripts/install.sh
  2. 2
    1
      ovs_build/build-ovs-dpdk.sh
  3. 2
    1
      ovs_build/build-ovs-nsh-dpdk.sh

+ 3
- 2
deployment_scripts/install.sh View File

@@ -10,10 +10,11 @@ nsh=$2
10 10
 dpdk=$3
11 11
 dpdk_socket_mem=${4:-''}
12 12
 pmd_cpu_mask=${5:-'2'}
13
+deb_arch=$(dpkg --print-architecture)
13 14
 
14
-ovs="ovs-dpdk.tar.gz"
15
+ovs="ovs-dpdk_${deb_arch}.tar.gz"
15 16
 if [ $nsh = 'true' ]; then
16
-    ovs="ovs-nsh-dpdk.tar.gz"
17
+    ovs="ovs-nsh-dpdk_${deb_arch}.tar.gz"
17 18
 fi
18 19
 
19 20
 apt-get install -y --allow-unauthenticated dkms

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

@@ -7,6 +7,7 @@ OVS_VER=${OVS_VER:-2.6.90}
7 7
 BUILD_DEST=${BUILD_DEST:-/deb}
8 8
 BUILD_SRC="$(dirname `readlink -f $0`)"
9 9
 BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
10
+DEB_ARCH="$(dpkg --print-architecture)"
10 11
 
11 12
 export DEB_BUILD_OPTIONS='parallel=8 nocheck'
12 13
 
@@ -92,4 +93,4 @@ debian/rules build; fakeroot debian/rules binary
92 93
 
93 94
 cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
94 95
 cd ${BUILD_HOME}/deb
95
-tar czvf ${BUILD_DEST}/ovs-dpdk.tar.gz .;
96
+tar czvf ${BUILD_DEST}/ovs-dpdk_${DEB_ARCH}.tar.gz .;

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

@@ -7,6 +7,7 @@ OVS_VER=${OVS_VER:-2.6.1}
7 7
 BUILD_DEST=${BUILD_DEST:-/deb}
8 8
 BUILD_SRC="$(dirname `readlink -f $0`)"
9 9
 BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
10
+DEB_ARCH="$(dpkg --print-architecture)"
10 11
 
11 12
 export DEB_BUILD_OPTIONS='parallel=8 nocheck'
12 13
 
@@ -104,4 +105,4 @@ debian/rules build; fakeroot debian/rules binary
104 105
 
105 106
 cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
106 107
 cd ${BUILD_HOME}/deb
107
-tar czvf ${BUILD_DEST}/ovs-nsh-dpdk.tar.gz .;
108
+tar czvf ${BUILD_DEST}/ovs-nsh-dpdk_${DEB_ARCH}.tar.gz .;

Loading…
Cancel
Save