Merge pull request #3911 from BlackDex/fix-arm-build

Fix arm builds

docker/Dockerfile.j2

@@ -114,6 +114,7 @@ RUN {{ mount_rust_cache -}} dpkg --add-architecture {{ package_arch_name }} \
         --no-install-recommends \
         gcc-{{ package_cross_compiler }} \
         libc6-dev{{ package_arch_prefix }} \
+        linux-libc-dev{{ package_arch_prefix }} \
         libmariadb-dev{{ package_arch_prefix }} \
         libmariadb-dev-compat{{ package_arch_prefix }} \
         libmariadb3{{ package_arch_prefix }} \

docker/arm64/Dockerfile

@@ -48,6 +48,7 @@ RUN dpkg --add-architecture arm64 \
         --no-install-recommends \
         gcc-aarch64-linux-gnu \
         libc6-dev:arm64 \
+        linux-libc-dev:arm64 \
         libmariadb-dev:arm64 \
         libmariadb-dev-compat:arm64 \
         libmariadb3:arm64 \

docker/arm64/Dockerfile.buildkit

@@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.
         --no-install-recommends \
         gcc-aarch64-linux-gnu \
         libc6-dev:arm64 \
+        linux-libc-dev:arm64 \
         libmariadb-dev:arm64 \
         libmariadb-dev-compat:arm64 \
         libmariadb3:arm64 \

docker/armv6/Dockerfile

@@ -48,6 +48,7 @@ RUN dpkg --add-architecture armel \
         --no-install-recommends \
         gcc-arm-linux-gnueabi \
         libc6-dev:armel \
+        linux-libc-dev:armel \
         libmariadb-dev:armel \
         libmariadb-dev-compat:armel \
         libmariadb3:armel \

docker/armv6/Dockerfile.buildkit

@@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.
         --no-install-recommends \
         gcc-arm-linux-gnueabi \
         libc6-dev:armel \
+        linux-libc-dev:armel \
         libmariadb-dev:armel \
         libmariadb-dev-compat:armel \
         libmariadb3:armel \

docker/armv7/Dockerfile

@@ -48,6 +48,7 @@ RUN dpkg --add-architecture armhf \
         --no-install-recommends \
         gcc-arm-linux-gnueabihf \
         libc6-dev:armhf \
+        linux-libc-dev:armhf \
         libmariadb-dev:armhf \
         libmariadb-dev-compat:armhf \
         libmariadb3:armhf \

docker/armv7/Dockerfile.buildkit

@@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.
         --no-install-recommends \
         gcc-arm-linux-gnueabihf \
         libc6-dev:armhf \
+        linux-libc-dev:armhf \
         libmariadb-dev:armhf \
         libmariadb-dev-compat:armhf \
         libmariadb3:armhf \