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>
This commit is contained in:
Alexandru Avadanii 2017-01-25 19:29:35 +01:00
parent cf24224808
commit 8736c8f6e6
3 changed files with 7 additions and 4 deletions

View File

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

View File

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

View File

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