Skip to content

Commit

Permalink
Remove usbutils from machine builds (#91942)
Browse files Browse the repository at this point in the history
  • Loading branch information
@frenck
frenck authored Apr 27, 2023
1 parent f9ac1f3 commit 3aa82e1
Show file tree
Hide file tree
Showing 20 changed files with 7 additions and 46 deletions.
3 changes: 1 addition & 2 deletions machine/generic-x86-64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions machine/intel-nuc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions machine/khadas-vim3
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions machine/odroid-c2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/odroid-c4
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/odroid-m1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/odroid-n2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/odroid-xu
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/armv7-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/qemuarm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/armhf-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/qemuarm-64
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/qemux86
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/i386-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 0 additions & 3 deletions machine/qemux86-64
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
ARG BUILD_VERSION
FROM homeassistant/amd64-homeassistant:$BUILD_VERSION

RUN apk --no-cache add \
usbutils
3 changes: 1 addition & 2 deletions machine/raspberrypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions machine/raspberrypi2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion machine/raspberrypi3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion machine/raspberrypi3-64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion machine/raspberrypi4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion machine/raspberrypi4-64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions machine/tinker
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions machine/yellow
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3aa82e1

Please sign in to comment.