test

Author: hefroy

tools/install-deps-cross-arm64.sh

@@ -40,10 +40,29 @@ if [ "${ARCH}" == "arm64" ]; then
     exit -1
 fi
 
-sed -i "s/deb http/deb [arch=${ARCH}] http/g" /etc/apt/sources.list
+print_file() {
+    echo ">>> $1: $2"
+    cat $2
+    echo ">>>"
+}
+
+print_file "Before patching" /etc/apt/sources.list
+sed -i -E "s/deb (http|mirror\+file)/deb [arch=${ARCH}] \1/g" /etc/apt/sources.list
 cp /etc/apt/sources.list /etc/apt/sources.list.d/arm64.list
-sed -i "s/deb \[arch=${ARCH}\] http/deb [arch=arm64] http/g" /etc/apt/sources.list.d/arm64.list
-sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/arm64.list
+sed -i -E "s/deb \[arch=${ARCH}\] (http|mirror\+file)/deb [arch=arm64] \1/g" /etc/apt/sources.list.d/arm64.list
+# GitHub uses a separate mirrors file
+if [ -f /etc/apt/apt-mirrors.txt ]; then
+    print_file "Before patching" /etc/apt/apt-mirrors.txt
+    cp /etc/apt/apt-mirrors.txt /etc/apt/apt-mirrors-arm64.txt
+    sed -i "s#/etc/apt/apt-mirrors.txt#/etc/apt/apt-mirrors-arm64.txt#g" /etc/apt/sources.list.d/arm64.list
+    PATCH_FILE="/etc/apt/apt-mirrors-arm64.txt"
+    print_file "After patching" /etc/apt/apt-mirrors-arm64.txt
+else
+    PATCH_FILE="/etc/apt/sources.list.d/arm64.list"
+fi
+sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" ${PATCH_FILE}
+print_file "After patching" /etc/apt/sources.list.d/arm64.list
+
 dpkg --add-architecture arm64
 apt update
 apt install -y \

tools/install-deps-cross-armhf.sh

@@ -40,10 +40,29 @@ if [ "${ARCH}" == "armhf" ]; then
     exit -1
 fi
 
-sed -i "s/deb http/deb [arch=${ARCH}] http/g" /etc/apt/sources.list
+print_file() {
+    echo ">>> $1: $2"
+    cat $2
+    echo ">>>"
+}
+
+print_file "Before patching" /etc/apt/sources.list
+sed -i -E "s/deb (http|mirror\+file)/deb [arch=${ARCH}] \1/g" /etc/apt/sources.list
 cp /etc/apt/sources.list /etc/apt/sources.list.d/armhf.list
-sed -i "s/deb \[arch=${ARCH}\] http/deb [arch=armhf] http/g" /etc/apt/sources.list.d/armhf.list
-sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/armhf.list
+sed -i -E "s/deb \[arch=${ARCH}\] (http|mirror\+file)/deb [arch=armhf] \1/g" /etc/apt/sources.list.d/armhf.list
+# GitHub uses a separate mirrors file
+if [ -f /etc/apt/apt-mirrors.txt ]; then
+    print_file "Before patching" /etc/apt/apt-mirrors.txt
+    cp /etc/apt/apt-mirrors.txt /etc/apt/apt-mirrors-armhf.txt
+    sed -i "s#/etc/apt/apt-mirrors.txt#/etc/apt/apt-mirrors-armhf.txt#g" /etc/apt/sources.list.d/armhf.list
+    PATCH_FILE="/etc/apt/apt-mirrors-armhf.txt"
+    print_file "After patching" /etc/apt/apt-mirrors-armhf.txt
+else
+    PATCH_FILE="/etc/apt/sources.list.d/armhf.list"
+fi
+sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" ${PATCH_FILE}
+print_file "After patching" /etc/apt/sources.list.d/armhf.list
+
 dpkg --add-architecture armhf
 apt update
 apt install -y \