From a4ee768ddbb97d4aea9b39e30dd3b413c02f5bcf Mon Sep 17 00:00:00 2001 From: Tomas Weinfurt Date: Fri, 5 Aug 2022 05:20:31 -0700 Subject: [PATCH] add support for arm packages (#2945) --- scripts/make-packages.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/scripts/make-packages.sh b/scripts/make-packages.sh index 9bbde68623..7b200a18f5 100755 --- a/scripts/make-packages.sh +++ b/scripts/make-packages.sh @@ -31,8 +31,16 @@ if [ "$OS" == 'Linux' ]; then ARCH='x64' LIBDIR="lib64" else - ARCH=x86 LIBDIR="lib" + if [ "$ARCH" == "aarch64" ]; then + ARCH=arm64 + else + if [ "$ARCH" == "armv7l" ]; then + ARCH=arm + else + ARCH=x86 + fi + fi fi else if [ "$OS" == 'Darwin' ]; then @@ -53,6 +61,9 @@ while :; do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" case $lowerI in + -a|-arch|--arch) + ARCH=$1 + ;; -d|-debug|--debug) CONFIG=Debug ;; @@ -119,9 +130,16 @@ if [ "$OS" == "linux" ]; then ${FILES} # Debian/Ubuntu - if [ "$LIBDIR" == 'lib64' ]; then + if [ "$ARCH" == 'x64' ]; then LIBDIR="lib/x86_64-linux-gnu" fi + if [ "$ARCH" == 'arm64' ];then + LIBDIR="lib/aarch64-linux-gnu" + fi + if [ "$ARCH" == 'arm' ];then + LIBDIR="lib/arm-linux-gnueabihf" + fi + FILES="${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" FILES="${FILES} ${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}" if [ -e "$ARTIFACTS/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" ]; then