From b6007832e5ca51185bbcf974301ac6675062b378 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:38:09 +0100 Subject: [PATCH 01/12] DHT dynamic version --- machine/raspberrypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machine/raspberrypi b/machine/raspberrypi index 60120567b6..ab8bd4b092 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -33,9 +33,11 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT +ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git \ - && git clone --depth 1 -b 1.3.4 https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ + && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 1/' setup.py \ && sed -i 's/^platform\ =\ platform_detect.UNKNOWN/platform\ =\ platform_detect.RASPBERRY_PI/' setup.py \ From 910f6002f11eed9b1bb227a25fb97d23027c4e57 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:41:04 +0100 Subject: [PATCH 02/12] Update raspberrypi2 --- machine/raspberrypi2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index 59ef488403..d89a43c6cb 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -33,9 +33,11 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT +ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git \ - && git clone --depth 1 -b 1.3.4 https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ + && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 2/' setup.py \ && sed -i 's/^platform\ =\ platform_detect.UNKNOWN/platform\ =\ platform_detect.RASPBERRY_PI/' setup.py \ From 7d16ce753cc1d3cefcda4dde0630edf5436064a5 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:41:31 +0100 Subject: [PATCH 03/12] Update raspberrypi3 --- machine/raspberrypi3 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index e580e783b8..7e15abb419 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -33,9 +33,11 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT +ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git \ - && git clone --depth 1 -b 1.3.4 https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ + && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 3/' setup.py \ && sed -i 's/^platform\ =\ platform_detect.UNKNOWN/platform\ =\ platform_detect.RASPBERRY_PI/' setup.py \ From f92723353f18649ca59fdc80a5061192c66a549b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:42:38 +0100 Subject: [PATCH 04/12] Update raspberrypi3-64 --- machine/raspberrypi3-64 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 6c62811778..19f8fa48f5 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -33,9 +33,11 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT +ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git raspberrypi-dev \ - && git clone --depth 1 -b 1.3.4 https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ + && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 3/' setup.py \ && sed -i 's/^platform\ =\ platform_detect.UNKNOWN/platform\ =\ platform_detect.RASPBERRY_PI/' setup.py \ From 0627e2e6d3ac30673e415ae9954a14389305dcc7 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:42:52 +0100 Subject: [PATCH 05/12] Update raspberrypi --- machine/raspberrypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine/raspberrypi b/machine/raspberrypi index ab8bd4b092..ec0da1ed3b 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} # Install DHT ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ - gcc libc-dev git \ + gcc libc-dev git raspberrypi-dev \ && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ From 13f9cf607f5516caba24fbb52f7e6acb1e6ba72f Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:43:09 +0100 Subject: [PATCH 06/12] Update raspberrypi2 --- machine/raspberrypi2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index d89a43c6cb..ce50d87823 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} # Install DHT ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ - gcc libc-dev git \ + gcc libc-dev git raspberrypi-dev \ && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ From 32ae0f783422ecf94a21d8993c7b03cfedd29efe Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Nov 2018 16:43:24 +0100 Subject: [PATCH 07/12] Update raspberrypi3 --- machine/raspberrypi3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index 7e15abb419..fc543a993d 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} # Install DHT ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ - gcc libc-dev git \ + gcc libc-dev git raspberrypi-dev \ && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ From f92fb0e079dbd622f0c709f930eddbd3c1a43fa1 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Nov 2018 13:34:19 +0100 Subject: [PATCH 08/12] Update Dockerfile --- generic/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/generic/Dockerfile b/generic/Dockerfile index b17dedec19..a402389809 100644 --- a/generic/Dockerfile +++ b/generic/Dockerfile @@ -34,6 +34,7 @@ RUN apk add --no-cache \ && pip3 install --no-cache-dir -r homeassistant/requirements_all.txt -c homeassistant/homeassistant/package_constraints.txt \ && pip3 install --no-cache-dir ./homeassistant \ && apk del .build-dependencies \ + && cp -f homeassistant/requirements_all.txt /root/ \ && rm -r homeassistant # Run Home Assistant From f2525b53012196f2b71aa59980fe1c0b0ce514e5 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Nov 2018 13:35:14 +0100 Subject: [PATCH 09/12] Update raspberrypi --- machine/raspberrypi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/machine/raspberrypi b/machine/raspberrypi index ec0da1ed3b..6ac2a7c0da 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -33,10 +33,9 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT -ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git raspberrypi-dev \ - && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && export DHT_VERSION="$(cat /root/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 1/' setup.py \ From e59876c41627614c5c29429f21e5b8bf6295c782 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Nov 2018 13:35:44 +0100 Subject: [PATCH 10/12] Update raspberrypi2 --- machine/raspberrypi2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index ce50d87823..20b9661a49 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -33,10 +33,9 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT -ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git raspberrypi-dev \ - && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && export DHT_VERSION="$(cat /root/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 2/' setup.py \ From 26eb06a694bfd9643d5746c1265cf53c41138504 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Nov 2018 13:36:02 +0100 Subject: [PATCH 11/12] Update raspberrypi3 --- machine/raspberrypi3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index fc543a993d..65f307cd7f 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -33,10 +33,9 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT -ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git raspberrypi-dev \ - && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && export DHT_VERSION="$(cat /root/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 3/' setup.py \ From 0f2dcb7cdbc9cc88034a25401472cb96b3b2c21d Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Nov 2018 13:36:37 +0100 Subject: [PATCH 12/12] Update raspberrypi3-64 --- machine/raspberrypi3-64 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 19f8fa48f5..d69e64850d 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -33,10 +33,9 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} ## # Install DHT -ARG BUILD_VERSION RUN apk add --no-cache --virtual .build-dependencies \ gcc libc-dev git raspberrypi-dev \ - && export DHT_VERSION="$(curl -sL https://raw.githubusercontent.com/home-assistant/home-assistant/${BUILD_VERSION}/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ + && export DHT_VERSION="$(cat /root/requirements_all.txt | sed -n 's|.*Adafruit-DHT==\([0-9\.]*\).*|\1|p')" \ && git clone --depth 1 -b ${DHT_VERSION} https://github.com/adafruit/Adafruit_Python_DHT /usr/src/dht \ && cd /usr/src/dht \ && sed -i 's/^pi_version\ =\ None/pi_version\ =\ 3/' setup.py \