Skip to content

Commit

Permalink
Upgrade deConz to v2.28.1 (home-assistant#3708)
Browse files Browse the repository at this point in the history
* Upgrade deConz to v2.27.6

* Fix typo in Deconz Version

Co-authored-by: Maxime D. <[email protected]>

* Use Debian Bookworm as base

WiringPi fails compilation due to missing symbols - according to the deCONZ forum it is not required anymore, therefore I removed it.

Debian Buster is out of support since a few weeks now.
This should be updated to Bookworm.
The new release has no package for wmii anymore and manual compilation seems to be not possible as various required libraries are not available anymore (Not even as source).
I've changed the window manager to dwm for now.

Additionally the netcat package has been renamed to netcat-traditional.

* Upgrade deCONZ to v2.28.1

* Let this update be v7.0.0 of the addon

* Remove old otau script usage

---------

Co-authored-by: Maxime D. <[email protected]>
  • Loading branch information
jannickfahlbusch and hiteule authored Aug 30, 2024
1 parent 3200934 commit cca82be
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 42 deletions.
8 changes: 7 additions & 1 deletion deconz/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 7.0.0

- Bump deCONZ to 2.28.1
- Use debian bookworm for all arch types
- Use dwm instead of wmii as window manager

## 6.23.0

- Bump deCONZ to 2.25.3
Expand All @@ -23,7 +29,7 @@
## 6.18.0

- Bump deCONZ to 2.20.1

## 6.17.1

- Bump deCONZ to 2.19.3
Expand Down
29 changes: 3 additions & 26 deletions deconz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
dwm \
iproute2 \
iputils-ping \
kmod \
Expand All @@ -24,41 +25,17 @@ RUN \
libqt5widgets5 \
libqt5qml5 \
lsof \
netcat \
netcat-traditional \
nginx \
novnc \
sqlite3 \
tigervnc-common \
tigervnc-standalone-server \
udev \
wget \
wmii \
xfonts-base \
xfonts-scalable \
&& rm -rf /var/lib/apt/lists/* \
&& if [[ "armhf aarch64" = *"$BUILD_ARCH"* ]]; \
then \
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
&& rm -rf /var/lib/apt/lists/*

# Install deCONZ
ARG DECONZ_VERSION
Expand Down
8 changes: 4 additions & 4 deletions deconz/build.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base-debian:buster
amd64: ghcr.io/home-assistant/amd64-base-debian:buster
armhf: ghcr.io/home-assistant/armhf-base-raspbian:buster
aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
armhf: ghcr.io/home-assistant/armhf-base-raspbian:bookworm
codenotary:
signer: [email protected]
base_image: [email protected]
args:
DECONZ_VERSION: 2.25.3
DECONZ_VERSION: 2.28.1
2 changes: 1 addition & 1 deletion deconz/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 6.23.0
version: 7.0.0
slug: deconz
name: deCONZ
description: >-
Expand Down
10 changes: 0 additions & 10 deletions deconz/rootfs/etc/services.d/otau-deconz/run

This file was deleted.

0 comments on commit cca82be

Please sign in to comment.