From 3aa82e122cbc7a5c39863084e3848a4e9b7cce7e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 27 Apr 2023 17:10:07 +0200 Subject: [PATCH] Remove usbutils from machine builds (#91942) --- machine/generic-x86-64 | 3 +-- machine/intel-nuc | 3 +-- machine/khadas-vim3 | 4 +--- machine/odroid-c2 | 3 --- machine/odroid-c4 | 3 --- machine/odroid-m1 | 3 --- machine/odroid-n2 | 3 --- machine/odroid-xu | 3 --- machine/qemuarm | 3 --- machine/qemuarm-64 | 3 --- machine/qemux86 | 3 --- machine/qemux86-64 | 3 --- machine/raspberrypi | 3 +-- machine/raspberrypi2 | 3 +-- machine/raspberrypi3 | 1 - machine/raspberrypi3-64 | 1 - machine/raspberrypi4 | 1 - machine/raspberrypi4-64 | 1 - machine/tinker | 3 +-- machine/yellow | 3 +-- 20 files changed, 7 insertions(+), 46 deletions(-) diff --git a/machine/generic-x86-64 b/machine/generic-x86-64 index b7fbac2e8ed..bbd72e93d51 100644 --- a/machine/generic-x86-64 +++ b/machine/generic-x86-64 @@ -2,5 +2,4 @@ ARG BUILD_VERSION FROM homeassistant/amd64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ - libva-intel-driver \ - usbutils + libva-intel-driver diff --git a/machine/intel-nuc b/machine/intel-nuc index 5e1b7f957d1..9b8a2b3eef9 100644 --- a/machine/intel-nuc +++ b/machine/intel-nuc @@ -5,5 +5,4 @@ FROM homeassistant/amd64-homeassistant:$BUILD_VERSION # changes in generic-x86-64 as well. RUN apk --no-cache add \ - libva-intel-driver \ - usbutils + libva-intel-driver diff --git a/machine/khadas-vim3 b/machine/khadas-vim3 index 2109262b342..d5286392659 100644 --- a/machine/khadas-vim3 +++ b/machine/khadas-vim3 @@ -1,9 +1,7 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION -RUN apk --no-cache add \ - usbutils \ - && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ +RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ --use-deprecated=legacy-resolver diff --git a/machine/odroid-c2 b/machine/odroid-c2 index be07d6c8aba..af934f31f0e 100644 --- a/machine/odroid-c2 +++ b/machine/odroid-c2 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/odroid-c4 b/machine/odroid-c4 index be07d6c8aba..af934f31f0e 100644 --- a/machine/odroid-c4 +++ b/machine/odroid-c4 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/odroid-m1 b/machine/odroid-m1 index be07d6c8aba..af934f31f0e 100644 --- a/machine/odroid-m1 +++ b/machine/odroid-m1 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/odroid-n2 b/machine/odroid-n2 index be07d6c8aba..af934f31f0e 100644 --- a/machine/odroid-n2 +++ b/machine/odroid-n2 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/odroid-xu b/machine/odroid-xu index 3aa428d3f52..57f6d0cddb8 100644 --- a/machine/odroid-xu +++ b/machine/odroid-xu @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/armv7-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/qemuarm b/machine/qemuarm index e00c945e945..54fc002097a 100644 --- a/machine/qemuarm +++ b/machine/qemuarm @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/armhf-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/qemuarm-64 b/machine/qemuarm-64 index be07d6c8aba..af934f31f0e 100644 --- a/machine/qemuarm-64 +++ b/machine/qemuarm-64 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/qemux86 b/machine/qemux86 index 1b5350df4c8..23264cb6b18 100644 --- a/machine/qemux86 +++ b/machine/qemux86 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/i386-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/qemux86-64 b/machine/qemux86-64 index 541e994b967..3e7a43d1335 100644 --- a/machine/qemux86-64 +++ b/machine/qemux86-64 @@ -1,5 +1,2 @@ ARG BUILD_VERSION FROM homeassistant/amd64-homeassistant:$BUILD_VERSION - -RUN apk --no-cache add \ - usbutils diff --git a/machine/raspberrypi b/machine/raspberrypi index 8ea2d08bba7..876fcfce21e 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -3,8 +3,7 @@ FROM homeassistant/armhf-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ - raspberrypi-libs \ - usbutils + raspberrypi-libs ## # Set symlinks for raspberry pi camera binaries. diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index 45f7a9c80d1..5d109e240b7 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -3,8 +3,7 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ - raspberrypi-libs \ - usbutils + raspberrypi-libs ## # Set symlinks for raspberry pi binaries. diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index 25182586707..598898199e4 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -4,7 +4,6 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ raspberrypi-libs \ - usbutils \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 48838cc13e1..3db31631426 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -4,7 +4,6 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ raspberrypi-libs \ - usbutils \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ diff --git a/machine/raspberrypi4 b/machine/raspberrypi4 index 25182586707..598898199e4 100644 --- a/machine/raspberrypi4 +++ b/machine/raspberrypi4 @@ -4,7 +4,6 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ raspberrypi-libs \ - usbutils \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64 index 48838cc13e1..3db31631426 100644 --- a/machine/raspberrypi4-64 +++ b/machine/raspberrypi4-64 @@ -4,7 +4,6 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ raspberrypi-libs \ - usbutils \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ diff --git a/machine/tinker b/machine/tinker index 2fb01f2b545..60a99734fe4 100644 --- a/machine/tinker +++ b/machine/tinker @@ -1,8 +1,7 @@ ARG BUILD_VERSION FROM homeassistant/armv7-homeassistant:$BUILD_VERSION -RUN apk --no-cache add usbutils \ - && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ +RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ pybluez \ -c /usr/src/homeassistant/requirements_all.txt \ --use-deprecated=legacy-resolver diff --git a/machine/yellow b/machine/yellow index d8e7421f9b1..9205b90389a 100644 --- a/machine/yellow +++ b/machine/yellow @@ -3,8 +3,7 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ raspberrypi \ - raspberrypi-libs \ - usbutils + raspberrypi-libs ## # Set symlinks for raspberry pi binaries.