Skip to content

Commit

Permalink
Fix wiringpi (#1478)
Browse files Browse the repository at this point in the history
* Fix wiringpi

* Fix update

* fix typo

* Fix install issue

* small cleanup
  • Loading branch information
pvizeli authored Jul 20, 2020
1 parent d0a50b9 commit 5b40cf5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 16 deletions.
15 changes: 4 additions & 11 deletions deconz/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 6.0.1

- Fix wiringPi and built it from source

## 6.0.0

- Use debian buster for all arch types
Expand Down Expand Up @@ -60,14 +64,3 @@

_Please note: This release works best with Home Assistant 0.103.4 or newer,
that release contains fixes/optimizations for the add-on as well._

## 4.1.0

- Change internal API port back to 40850, to prevent issue with discovery

## 4.0.0

- Bump deCONZ to 2.05.72
- Add support for Hass.io Ingress
- Improve auto discovery handling
- Remove support for UPnP
25 changes: 21 additions & 4 deletions deconz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,26 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& if [ "${BUILD_ARCH}" = "armhf" ]; \
then \
curl -q -L -o /tmp/wiringpi.deb https://project-downloads.drogon.net/wiringpi-latest.deb \
&& dpkg --force-architecture -i /tmp/wiringpi.deb \
&& rm -rf /tmp/wiringpi.deb; \
apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \
git \
&& git clone --depth 1 https://github.com/WiringPi/WiringPi /usr/src/wiringpi \
&& cd /usr/src/wiringpi/wiringPi \
&& make \
&& make install \
&& cd ../devLib \
&& make \
&& make install \
&& cd ../gpio \
&& make \
&& make install \
&& apt-get purge -y --auto-remove \
build-essential \
git \
&& rm -rf \
/var/lib/apt/lists/* \
/usr/src/wiringpi; \
fi

# Install deCONZ
Expand All @@ -50,7 +67,7 @@ RUN if [ "${BUILD_ARCH}" = "armhf" ]; \
else \
curl -q -L -o /deconz.deb http://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${DECONZ_VERSION}-qt5.deb; \
fi \
&& dpkg -i /deconz.deb \
&& dpkg --force-all -i /deconz.deb \
&& rm -f /deconz.deb \
&& chown root:root /usr/bin/deCONZ* \
&& sed -i 's/\/root/\/data/' /etc/passwd
Expand Down
2 changes: 1 addition & 1 deletion deconz/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deCONZ",
"version": "6.0.0",
"version": "6.0.1",
"slug": "deconz",
"description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
"arch": ["amd64", "armhf", "aarch64"],
Expand Down

0 comments on commit 5b40cf5

Please sign in to comment.