summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-03 00:18:07 +0000
committerGerrit Code Review <review@openstack.org>2017-02-03 00:18:07 +0000
commit9b5292b24444232889fc73f4961251bd75f3fc38 (patch)
treecb83881fbe4558d5b52bc50e0b0985f62241b8e0
parentead29f4f3ffa13cbfe1049ee015ca7681a2bd474 (diff)
parent8736c8f6e6b7cf6769d301f43e837865a2c6ea6b (diff)
Merge "Multiarch: Arch-qualify DEB binary archives"
-rw-r--r--deployment_scripts/install.sh5
-rwxr-xr-xovs_build/build-ovs-dpdk.sh3
-rwxr-xr-xovs_build/build-ovs-nsh-dpdk.sh3
3 files changed, 7 insertions, 4 deletions
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
index 821668d..990fb7c 100644
--- a/deployment_scripts/install.sh
+++ b/deployment_scripts/install.sh
@@ -10,10 +10,11 @@ nsh=$2
10dpdk=$3 10dpdk=$3
11dpdk_socket_mem=${4:-''} 11dpdk_socket_mem=${4:-''}
12pmd_cpu_mask=${5:-'2'} 12pmd_cpu_mask=${5:-'2'}
13deb_arch=$(dpkg --print-architecture)
13 14
14ovs="ovs-dpdk.tar.gz" 15ovs="ovs-dpdk_${deb_arch}.tar.gz"
15if [ $nsh = 'true' ]; then 16if [ $nsh = 'true' ]; then
16 ovs="ovs-nsh-dpdk.tar.gz" 17 ovs="ovs-nsh-dpdk_${deb_arch}.tar.gz"
17fi 18fi
18 19
19apt-get install -y --allow-unauthenticated dkms 20apt-get install -y --allow-unauthenticated dkms
diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
index 678c739..7ce2a62 100755
--- a/ovs_build/build-ovs-dpdk.sh
+++ b/ovs_build/build-ovs-dpdk.sh
@@ -7,6 +7,7 @@ OVS_VER=${OVS_VER:-2.6.90}
7BUILD_DEST=${BUILD_DEST:-/deb} 7BUILD_DEST=${BUILD_DEST:-/deb}
8BUILD_SRC="$(dirname `readlink -f $0`)" 8BUILD_SRC="$(dirname `readlink -f $0`)"
9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk} 9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
10DEB_ARCH="$(dpkg --print-architecture)"
10 11
11export DEB_BUILD_OPTIONS='parallel=8 nocheck' 12export DEB_BUILD_OPTIONS='parallel=8 nocheck'
12 13
@@ -92,4 +93,4 @@ debian/rules build; fakeroot debian/rules binary
92 93
93cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb 94cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
94cd ${BUILD_HOME}/deb 95cd ${BUILD_HOME}/deb
95tar czvf ${BUILD_DEST}/ovs-dpdk.tar.gz .; 96tar czvf ${BUILD_DEST}/ovs-dpdk_${DEB_ARCH}.tar.gz .;
diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
index 37a9d33..e6f8faf 100755
--- a/ovs_build/build-ovs-nsh-dpdk.sh
+++ b/ovs_build/build-ovs-nsh-dpdk.sh
@@ -7,6 +7,7 @@ OVS_VER=${OVS_VER:-2.6.1}
7BUILD_DEST=${BUILD_DEST:-/deb} 7BUILD_DEST=${BUILD_DEST:-/deb}
8BUILD_SRC="$(dirname `readlink -f $0`)" 8BUILD_SRC="$(dirname `readlink -f $0`)"
9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk} 9BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
10DEB_ARCH="$(dpkg --print-architecture)"
10 11
11export DEB_BUILD_OPTIONS='parallel=8 nocheck' 12export DEB_BUILD_OPTIONS='parallel=8 nocheck'
12 13
@@ -104,4 +105,4 @@ debian/rules build; fakeroot debian/rules binary
104 105
105cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb 106cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
106cd ${BUILD_HOME}/deb 107cd ${BUILD_HOME}/deb
107tar czvf ${BUILD_DEST}/ovs-nsh-dpdk.tar.gz .; 108tar czvf ${BUILD_DEST}/ovs-nsh-dpdk_${DEB_ARCH}.tar.gz .;