From 5fcfc12f5bf26cde98ecf5b3685964b6dcd512ee Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 8 Dec 2024 22:24:27 +0800 Subject: [PATCH] update DEB_MULTIARCH --- amd64/additional-base-lib/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/amd64/additional-base-lib/build.sh b/amd64/additional-base-lib/build.sh index 445b033..c457c98 100755 --- a/amd64/additional-base-lib/build.sh +++ b/amd64/additional-base-lib/build.sh @@ -9,10 +9,12 @@ if [ "$1" = "amd64" ] || [ "$1" = "x64" ];then ARCH="amd64" ARCH_ANOTHERWAY="-amd64" ARCH_STORE_PATH="amd64-store" +DEBIAN_MULTIARCH="x86_64-linux-gnu" elif [ "$1" = "arm64" ] || [ "$1" = "arm" ];then ARCH="arm64" ARCH_ANOTHERWAY="-aarch64" ARCH_STORE_PATH="arm64-store" +DEBIAN_MULTIARCH="aarch64-linux-gnu" elif [ "$1" = "loong64" ];then ARCH="loong64" ARCH_ANOTHERWAY="-loong64" @@ -174,10 +176,7 @@ DEBIAN_DEB_ARCH=$LIBC6_ARCH echo "$DEBIAN_DEB_ARCH" echo "debian multiarch directory name:" -DEBIAN_MULTIARCH=${ARCH} -check $? -DEBIAN_MULTIARCH=${DEBIAN_MULTIARCH:21} -echo "$DEBIAN_MULTIARCH" + echo "check usrmerge status:": if [ -d "./downloads/libc6/lib" ]