summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-25 19:29:35 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-25 20:23:54 +0100
commit8736c8f6e6b7cf6769d301f43e837865a2c6ea6b (patch)
treebd426254175483318618654e8d263b66f95fe00e
parentcf242248084333a92b3ffd9356b1535cc4a7fa43 (diff)
Multiarch: Arch-qualify DEB binary archives
Append "_amd64" (or "_arm64" for binaries built on AArch64) to the names of plugin archives containing DEB binaries. E.g. <ovs-dpdk.tar.gz> for <amd64> becomes <ovs-dpdk_amd64.tar.gz> Change-Id: Ib54e56ad9cc764cf4260b72236e306aaa8857c0e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Notes
Notes (review): Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 03 Feb 2017 00:18:07 +0000 Reviewed-on: https://review.openstack.org/425388 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-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 68c705f..3070e5a 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
@@ -91,4 +92,4 @@ debian/rules build; fakeroot debian/rules binary
91 92
92cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb 93cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
93cd ${BUILD_HOME}/deb 94cd ${BUILD_HOME}/deb
94tar czvf ${BUILD_DEST}/ovs-dpdk.tar.gz .; 95tar 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 dbf16c5..bc6cc71 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
@@ -103,4 +104,4 @@ debian/rules build; fakeroot debian/rules binary
103 104
104cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb 105cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
105cd ${BUILD_HOME}/deb 106cd ${BUILD_HOME}/deb
106tar czvf ${BUILD_DEST}/ovs-nsh-dpdk.tar.gz .; 107tar czvf ${BUILD_DEST}/ovs-nsh-dpdk_${DEB_ARCH}.tar.gz .;