Remove usbutils from machine builds (#91942)

2023-04-27 17:10:07 +02:00 · 2023-04-27 17:10:07 +02:00 · 3aa82e122c
parent f9ac1f3839
commit 3aa82e122c
20 changed files with 7 additions and 46 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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.
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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
--- 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.