vw_small

commit bc26bfa589c007da9b9be37e1172060f38a948b9
parent 99a59bc4f32bc01b7b2ad9d5f0090d864a2905e3
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Fri, 22 Sep 2023 13:48:11 -0600

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

Fix arm builds
Diffstat:
M
docker/Dockerfile.j2
 | 
1
+
M
docker/arm64/Dockerfile
 | 
1
+
M
docker/arm64/Dockerfile.buildkit
 | 
1
+
M
docker/armv6/Dockerfile
 | 
1
+
M
docker/armv6/Dockerfile.buildkit
 | 
1
+
M
docker/armv7/Dockerfile
 | 
1
+
M
docker/armv7/Dockerfile.buildkit
 | 
1
+

7 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/docker/Dockerfile.j2 b/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 }} \
diff --git a/docker/arm64/Dockerfile b/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 \
diff --git a/docker/arm64/Dockerfile.buildkit b/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 \
diff --git a/docker/armv6/Dockerfile b/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 \
diff --git a/docker/armv6/Dockerfile.buildkit b/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 \
diff --git a/docker/armv7/Dockerfile b/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 \
diff --git a/docker/armv7/Dockerfile.buildkit b/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 \