Use legacy pip resolver in machine builds (home-assistant#66094)

iDVB · Feb 8, 2022 · 1bc82e2 · 1bc82e2
1 parent a7fd477
commit 1bc82e2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/machine/raspberrypi b/machine/raspberrypi
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi camera binaries.

diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi binaries.

diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi binaries.

diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi binaries.

diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi binaries.

diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
@@ -7,7 +7,8 @@ RUN apk --no-cache add \
         usbutils \
     && sed -i "s|# RPi.GPIO|RPi.GPIO|g" /usr/src/homeassistant/requirements_all.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt
+        RPi.GPIO bluepy pybluez -c /usr/src/homeassistant/requirements_all.txt \
+        --use-deprecated=legacy-resolver
 
 ##
 # Set symlinks for raspberry pi binaries.

diff --git a/machine/tinker b/machine/tinker
@@ -4,6 +4,7 @@ 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}" \
         -c /usr/src/homeassistant/homeassistant/package_constraints.txt \
+        --use-deprecated=legacy-resolver \
         bluepy \
         pybluez \
         pygatt[GATTTOOL]