From 9b6839aecf73454a2669cd4cb4e8573f9dc0b1d0 Mon Sep 17 00:00:00 2001 From: E Shattow Date: Mon, 13 Jan 2025 11:44:33 -0800 Subject: [PATCH] Update auditwheel to 6.2.0 (#822) --- 0001-Support-musllinux-armv6l.patch | 26 ++++++++++++++------------ Dockerfile | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/0001-Support-musllinux-armv6l.patch b/0001-Support-musllinux-armv6l.patch index 731e24d..50db4d3 100644 --- a/0001-Support-musllinux-armv6l.patch +++ b/0001-Support-musllinux-armv6l.patch @@ -1,4 +1,4 @@ -From 61997d54a968ac9df4e7df5de0a792f7b03881f8 Mon Sep 17 00:00:00 2001 +From 1c9bba7af44d2465d3657f7a63f8a0ffdca3239b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 15 Jun 2022 12:48:56 +0000 Subject: [PATCH] Support musllinux armv6l @@ -9,19 +9,19 @@ Subject: [PATCH] Support musllinux armv6l 2 files changed, 5 insertions(+) diff --git a/src/auditwheel/policy/__init__.py b/src/auditwheel/policy/__init__.py -index 7c9b158..90c7e17 100644 +index f38ab43..8ed9db8 100644 --- a/src/auditwheel/policy/__init__.py +++ b/src/auditwheel/policy/__init__.py -@@ -279,6 +279,7 @@ def _fixup_musl_libc_soname(libc: Libc, arch: str, whitelist): +@@ -285,6 +285,7 @@ def _fixup_musl_libc_soname(libc: Libc, arch: str, whitelist): "aarch64": "libc.musl-aarch64.so.1", "s390x": "libc.musl-s390x.so.1", "ppc64le": "libc.musl-ppc64le.so.1", + "armv6l": "libc.musl-armvhf.so.1", "armv7l": "libc.musl-armv7.so.1", + "riscv64": "libc.musl-riscv64.so.1", } - } diff --git a/src/auditwheel/policy/musllinux-policy.json b/src/auditwheel/policy/musllinux-policy.json -index b103099..9365636 100644 +index f2f6a06..c02436e 100644 --- a/src/auditwheel/policy/musllinux-policy.json +++ b/src/auditwheel/policy/musllinux-policy.json @@ -20,6 +20,8 @@ @@ -31,16 +31,18 @@ index b103099..9365636 100644 + "armv6l": { + }, "armv7l": { - } - }, -@@ -41,6 +43,8 @@ + }, + "riscv64": { +@@ -43,6 +45,8 @@ }, "s390x": { }, + "armv6l": { + }, "armv7l": { - } - }, --- -2.47.1 + }, + "riscv64": { + +base-commit: 7d50cf2e4ba1d46ec9ac361661e563fea84c6eca +-- +2.45.2 diff --git a/Dockerfile b/Dockerfile index fe981db..4209b7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG \ BUILD_ARCH \ CPYTHON_ABI \ QEMU_CPU \ - AUDITWHEEL_VERSION=6.1.0 \ + AUDITWHEEL_VERSION=6.2.0 \ PIP_EXTRA_INDEX_URL=https://wheels.home-assistant.io/musllinux-index/ \ WORKDIR /usr/src