From 7774a3d0c4fa2589e3f696955e032a7548944747 Mon Sep 17 00:00:00 2001 From: cociweb Date: Fri, 10 Jan 2025 14:46:01 +0100 Subject: [PATCH 1/7] Delete alpine directory --- alpine/0001-patch.patch | 24 ------------------------ alpine/APKBUILD | 34 ---------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 alpine/0001-patch.patch delete mode 100644 alpine/APKBUILD diff --git a/alpine/0001-patch.patch b/alpine/0001-patch.patch deleted file mode 100644 index 80330b0..0000000 --- a/alpine/0001-patch.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 952005870eab391f761f42d94c03091a7606a83c Mon Sep 17 00:00:00 2001 -From: Tim -Date: Mon, 19 Sep 2022 07:17:19 +0100 -Subject: [PATCH] patch - ---- - src/lib/knx/knxnet.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/knx/knxnet.h b/src/lib/knx/knxnet.h -index 13295ea..e01e9a2 100644 ---- a/src/lib/knx/knxnet.h -+++ b/src/lib/knx/knxnet.h -@@ -35,6 +35,7 @@ - #include - #include - #include "lib/knx/knx.h" -+#include - - namespace ebusd { - --- -2.36.2 - diff --git a/alpine/APKBUILD b/alpine/APKBUILD deleted file mode 100644 index 150c018..0000000 --- a/alpine/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Tim -# Maintainer: Tim -pkgname=ebusd -pkgver=22.4 -pkgrel=0 -pkgdesc="Daemon for communication with eBUS heating systems" -url="https://github.com/john30/ebusd" -# Upstream only supports these archs. -arch="x86 x86_64 aarch64 armhf armv7" -license="GPL-3.0-only" -makedepends="argp-standalone cmake mosquitto-dev openssl-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/john30/ebusd/archive/refs/tags/v$pkgver.tar.gz - 0001-patch.patch - " - -build() { - cmake -B build \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DBUILD_TESTING=ON - cmake --build build -} - -check() { - ctest --output-on-failure --test-dir build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} - -sha512sums=" -f625a8813eb5f844d1148eb9d683b9b730573e8c2bc1e3e2fec6462b3943340cfa1cfaf4cd50ff48b45aac47841189ad5d699316907b6abb6e7d1c20a0352842 ebusd-22.4.tar.gz -179072f10cabeea360b71f2f7fe65b822e932e2dceaecbf15589936de90aaefa295d5d8ed0c506255aade46d71fe4fba21fc1090fa46032019490f09ed0dd6a8 0001-patch.patch -" From 6f9b1eacef39841b25d2e2c5da9a47aa06eb9ea4 Mon Sep 17 00:00:00 2001 From: cociweb Date: Fri, 10 Jan 2025 14:46:48 +0100 Subject: [PATCH 2/7] Remove Edge package repository --- ebusd/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ebusd/Dockerfile b/ebusd/Dockerfile index adaf83a..4744b4b 100644 --- a/ebusd/Dockerfile +++ b/ebusd/Dockerfile @@ -3,11 +3,6 @@ FROM $BUILD_FROM ENV LANG C.UTF-8 -RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" \ - >> /etc/apk/repositories -RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" \ - >> /etc/apk/repositories - RUN apk add --no-cache ebusd=24.1-r0 LABEL Description="ebusd" From c1094b3d84a2451bf4dac1f2e0565217f03b8a37 Mon Sep 17 00:00:00 2001 From: cociweb Date: Fri, 10 Jan 2025 14:48:04 +0100 Subject: [PATCH 3/7] Update alpine base image Move the base images from 3.18 to the latest (currently 3.21) --- ebusd/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ebusd/build.yaml b/ebusd/build.yaml index 0690664..4b6cb83 100644 --- a/ebusd/build.yaml +++ b/ebusd/build.yaml @@ -1,9 +1,9 @@ build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:3.18" - amd64: "ghcr.io/home-assistant/amd64-base:3.18" - armhf: "ghcr.io/home-assistant/armhf-base:3.18" - armv7: "ghcr.io/home-assistant/armv7-base:3.18" - i386: "ghcr.io/home-assistant/i386-base:3.18" + aarch64: "ghcr.io/home-assistant/aarch64-base:latest" + amd64: "ghcr.io/home-assistant/amd64-base:latest" + armhf: "ghcr.io/home-assistant/armhf-base:latest" + armv7: "ghcr.io/home-assistant/armv7-base:latest" + i386: "ghcr.io/home-assistant/i386-base:latest" labels: org.opencontainers.image.title: "Home Assistant Add-on: Ebusd" org.opencontainers.image.description: "This Add-on runs eBUSd, a daemon for handling communication with eBUS devices" From 81f479e15039e0cf7bbd96353fbe4daffb4cac8f Mon Sep 17 00:00:00 2001 From: Lukas Grebe Date: Fri, 10 Jan 2025 16:36:25 +0100 Subject: [PATCH 4/7] switch from latest to 3.21 --- ebusd/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ebusd/build.yaml b/ebusd/build.yaml index 4b6cb83..9168194 100644 --- a/ebusd/build.yaml +++ b/ebusd/build.yaml @@ -1,9 +1,9 @@ build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:latest" - amd64: "ghcr.io/home-assistant/amd64-base:latest" - armhf: "ghcr.io/home-assistant/armhf-base:latest" - armv7: "ghcr.io/home-assistant/armv7-base:latest" - i386: "ghcr.io/home-assistant/i386-base:latest" + aarch64: "ghcr.io/home-assistant/aarch64-base:3.21" + amd64: "ghcr.io/home-assistant/amd64-base:3.21" + armhf: "ghcr.io/home-assistant/armhf-base:3.21" + armv7: "ghcr.io/home-assistant/armv7-base:3.21" + i386: "ghcr.io/home-assistant/i386-base:3.21" labels: org.opencontainers.image.title: "Home Assistant Add-on: Ebusd" org.opencontainers.image.description: "This Add-on runs eBUSd, a daemon for handling communication with eBUS devices" From 8f9a2e6532e74fef73dea1582f786143ec88cf66 Mon Sep 17 00:00:00 2001 From: Lukas Grebe Date: Fri, 10 Jan 2025 17:39:30 +0100 Subject: [PATCH 5/7] Fix Semantic Versioning Update changelog, Readme and config.yaml --- ebusd/CHANGELOG.md | 84 +++++++++++++++++++++++++++++++++++++++------- ebusd/README.md | 24 +++++++++++-- ebusd/config.yaml | 2 +- 3 files changed, 93 insertions(+), 17 deletions(-) diff --git a/ebusd/CHANGELOG.md b/ebusd/CHANGELOG.md index 62c605e..eac7b3f 100644 --- a/ebusd/CHANGELOG.md +++ b/ebusd/CHANGELOG.md @@ -1,25 +1,85 @@ - -## version: 24.1.0 - -- EBUSd 24.1 - -## version: 23.2.6 +# Changelog + +# next (tbd) +## Home Assistant Add-on + +### Features +* Add Home Assistant Ingress (Web UI) [#147](https://github.com/LukasGrebe/ha-addons/issues/147) +* Colorize Logo to identify Add-on as running in Home Assistant [#81](https://github.com/LukasGrebe/ha-addons/issues/81) +* Easier custom MQTT device configuration [#162](https://github.com/LukasGrebe/ha-addons/issues/162) +* Include configuration files with Add-on Backups by following [HA Changes](https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/) [#160](https://github.com/LukasGrebe/ha-addons/issues/160) + +### Improvements +* Drastically reduce Settings UI [#85](https://github.com/LukasGrebe/ha-addons/issues/85) +* Increase security classification by creating an apparmor profile [#83](https://github.com/LukasGrebe/ha-addons/issues/83) +* Update documentation [#146](https://github.com/LukasGrebe/ha-addons/issues/146) + +## [ebusd](https://github.com/john30/ebusd/blob/master/ChangeLog.md) +### Bug Fixes +* fix for device string symlink with colon +* fix "read" and "write" command response +* fix dump of divisor +* fix max value for S3N, S3N, SLG, and SLR types +* fix socket options for KNXnet/IP integration + +### Features +* add "-m" option to "encode" and "decode" commands +* add output for commands executed with "--inject=stop" + +# 24.1.1-ha-addon.1 +## Home Assistant Add-on + +### Improvements +* Fix semantic versioning: Add-on specific iterations are denoted by a pre-release identifier (e.g., `-ha-addon.1`). ebusd version is mirrored. + +### Bug Fixes +* Bump Home Assistant base image version from 2.18 to 3.21 + +# 24.1 (2024-10-27) +## [ebusd](https://github.com/john30/ebusd/blob/master/ChangeLog.md) +### Bug Fixes +* fix conditional messages not being sent to message definition in MQTT integration and not being used in KNX group association +* fix CSV dump of config files on command line +* fix DTM type with recent dates +* fix for some updated messages not appearing on KNX or MQTT +* fix for parsing certain condition ranges +* fix for "reload" command not starting the scan again +* fix datetime type mapping in MQTT + +### Features +* add "inject" command +* add config path to verbose "info" command +* add "answer" command +* add option to inject start-up commands +* add verbose raw data option to "read" and "write" commands +* add option to allow write direction in "read" command when inline defining a new message +* add option to discover device via mDNS +* add dedicated log level for device messages +* add option to extend MQTT variables from env/cmdline +* add date+datetime mapping, better device update check, and remove single-field-message field names in Home Assistant MQTT discovery integration + +### Breaking Changes +* change default config path to https://ebus.github.io/ serving files generated from new TypeSpec message definition sources +* change validation of identifiers to no longer accept unusual characters +* change default device connection to be resolved automatically via mDNS + +## 23.2.6 - Update HEALTHCHECK in Dockerfile to not use DNS [#126](https://github.com/LukasGrebe/ha-addons/issues/126) thanks @StCyr -## version: 23.2.5 +## 23.2.5 - Revert required mode [#116](https://github.com/LukasGrebe/ha-addons/issues/116) thanks @tjorim -## version: 23.2.4 +## 23.2.4 - added the option to store rotated logs in /config through s6-log [#102](https://github.com/LukasGrebe/ha-addons/issues/102) thanks @pvyleta -## version: 23.2.3 +## 23.2.3 - fix Healthcheck. This should solve [#61](https://github.com/LukasGrebe/ha-addons/issues/61) thanks @cociweb -## version: 23.2.0 +## 23.2.0 - Change build process to use pre-build containers. This should speed up the install of the addon as the addon does not need to be compiled from Supervisor before beeing run. - EBUSd 23.2 @@ -68,9 +128,7 @@ - IMPROVE: Add mqtttopic option - IMPROVE: Add mqttvar option - IMPROVE: Enable MQTT discovery by default -- IMPROVE: Align version number with eBUSd version - -## 0.87 +- IMPROVE: Align umber with eBUSd ## 0.87 - IMPROVE: Add poll interval option - IMPROVE: Improve option descriptions diff --git a/ebusd/README.md b/ebusd/README.md index df91634..d78ec4b 100644 --- a/ebusd/README.md +++ b/ebusd/README.md @@ -8,9 +8,27 @@ See [repository readme](https://github.com/LukasGrebe/ha-addons#how-to-install) See [docs](https://github.com/LukasGrebe/ha-addons/blob/main/ebusd/DOCS.md#how-to-run-ebusd) on how to run ebusd in supervisor. -**If you have questions or feedback please** -- via the [Home Assistant Forums Topic](https://community.home-assistant.io/t/an-ebusd-add-on/344852) -- via Issues and pull requests in the Github repository +## Support + +**Issues in Configuration and Usage** +Lots of issues result from incomplete [ebusd configuration](https://github.com/john30/ebusd/wiki/4.-Configuration) files. This project only runs ebusd, configurationfiles are **not** managed by this project. Please see the offical [ebusd project](https://ebusd.eu) and [community](https://github.com/john30/ebusd/discussions) for more information. + + +**If you have questions or feedback on running ebusd via supervisor** +- use [Issues](https://github.com/LukasGrebe/ha-addons/issues) and [pull requests](https://github.com/LukasGrebe/ha-addons/pulls) in the Github repository +- alternativly - but not checked as often - the [Home Assistant Forums Topic](https://community.home-assistant.io/t/an-ebusd-add-on/344852) + +## Versioning Scheme +This add-on is versioned in a way that [mirrors the `ebusd` version](https://github.com/john30/ebusd/releases). +Addon specific iterations are denoted by a pre-release identifier (e.g., `-ha-addon.1`). + +- **Major.Minor.Patch**: Mirrors the [corresponding `ebusd` version](https://github.com/john30/ebusd/releases). +- **Pre-release Identifier**: Used to denote add-on-specific iterations (e.g., `-ha-addon.1`). + +**Example**: `24.1.1-ha-addon.1` + + + *Not actually tested on any of these architectures* ![Supports aarch64 Architecture][aarch64-shield] diff --git a/ebusd/config.yaml b/ebusd/config.yaml index 8361dd6..0f67951 100644 --- a/ebusd/config.yaml +++ b/ebusd/config.yaml @@ -1,5 +1,5 @@ name: eBUSd -version: "24.1.0" +version: "24.1.1-ha-addon.1" slug: ebusd description: > This Add-on runs eBUSd, a daemon for handling communication with eBUS devices From 5e801077163cf56d6fa82a20ad20930b24595728 Mon Sep 17 00:00:00 2001 From: Lukas Grebe Date: Fri, 10 Jan 2025 18:26:08 +0100 Subject: [PATCH 6/7] Cleanup Readme --- ebusd/README.md | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/ebusd/README.md b/ebusd/README.md index d78ec4b..69fedc3 100644 --- a/ebusd/README.md +++ b/ebusd/README.md @@ -11,14 +11,14 @@ See [docs](https://github.com/LukasGrebe/ha-addons/blob/main/ebusd/DOCS.md#how-t ## Support **Issues in Configuration and Usage** -Lots of issues result from incomplete [ebusd configuration](https://github.com/john30/ebusd/wiki/4.-Configuration) files. This project only runs ebusd, configurationfiles are **not** managed by this project. Please see the offical [ebusd project](https://ebusd.eu) and [community](https://github.com/john30/ebusd/discussions) for more information. - +Many issues result from incomplete [ebusd configuration](https://github.com/john30/ebusd/wiki/4.-Configuration) files. This project only runs ebusd, configurationfiles are **not** managed by this project. Please see the offical [ebusd project](https://ebusd.eu) and [community](https://github.com/john30/ebusd/discussions) for more information. **If you have questions or feedback on running ebusd via supervisor** - use [Issues](https://github.com/LukasGrebe/ha-addons/issues) and [pull requests](https://github.com/LukasGrebe/ha-addons/pulls) in the Github repository - alternativly - but not checked as often - the [Home Assistant Forums Topic](https://community.home-assistant.io/t/an-ebusd-add-on/344852) ## Versioning Scheme + This add-on is versioned in a way that [mirrors the `ebusd` version](https://github.com/john30/ebusd/releases). Addon specific iterations are denoted by a pre-release identifier (e.g., `-ha-addon.1`). @@ -26,19 +26,3 @@ Addon specific iterations are denoted by a pre-release identifier (e.g., `-ha-ad - **Pre-release Identifier**: Used to denote add-on-specific iterations (e.g., `-ha-addon.1`). **Example**: `24.1.1-ha-addon.1` - - - - -*Not actually tested on any of these architectures* -![Supports aarch64 Architecture][aarch64-shield] -![Supports amd64 Architecture][amd64-shield] -![Supports armhf Architecture][armhf-shield] -![Supports armv7 Architecture][armv7-shield] -![Supports i386 Architecture][i386-shield] - -[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg -[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg -[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg -[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg -[i386-shield]: https://img.shields.io/badge/i386-yes-green.svg From c13278d31fe650ed7abd0f2e29666003a1794a9a Mon Sep 17 00:00:00 2001 From: Lukas Grebe Date: Fri, 10 Jan 2025 19:01:39 +0100 Subject: [PATCH 7/7] Different Semver setup as per discussion - use the patch number for addon specific changes --- ebusd/CHANGELOG.md | 59 ++++++++++++++++++++++++---------------------- ebusd/README.md | 7 +++--- ebusd/config.yaml | 2 +- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ebusd/CHANGELOG.md b/ebusd/CHANGELOG.md index eac7b3f..7d65271 100644 --- a/ebusd/CHANGELOG.md +++ b/ebusd/CHANGELOG.md @@ -1,36 +1,10 @@ # Changelog -# next (tbd) +# 24.1.1 ## Home Assistant Add-on -### Features -* Add Home Assistant Ingress (Web UI) [#147](https://github.com/LukasGrebe/ha-addons/issues/147) -* Colorize Logo to identify Add-on as running in Home Assistant [#81](https://github.com/LukasGrebe/ha-addons/issues/81) -* Easier custom MQTT device configuration [#162](https://github.com/LukasGrebe/ha-addons/issues/162) -* Include configuration files with Add-on Backups by following [HA Changes](https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/) [#160](https://github.com/LukasGrebe/ha-addons/issues/160) - ### Improvements -* Drastically reduce Settings UI [#85](https://github.com/LukasGrebe/ha-addons/issues/85) -* Increase security classification by creating an apparmor profile [#83](https://github.com/LukasGrebe/ha-addons/issues/83) -* Update documentation [#146](https://github.com/LukasGrebe/ha-addons/issues/146) - -## [ebusd](https://github.com/john30/ebusd/blob/master/ChangeLog.md) -### Bug Fixes -* fix for device string symlink with colon -* fix "read" and "write" command response -* fix dump of divisor -* fix max value for S3N, S3N, SLG, and SLR types -* fix socket options for KNXnet/IP integration - -### Features -* add "-m" option to "encode" and "decode" commands -* add output for commands executed with "--inject=stop" - -# 24.1.1-ha-addon.1 -## Home Assistant Add-on - -### Improvements -* Fix semantic versioning: Add-on specific iterations are denoted by a pre-release identifier (e.g., `-ha-addon.1`). ebusd version is mirrored. +* Fix semantic versioning: ebusd version is mirrored; Add-on specific iterations are denoted by the patch number. ### Bug Fixes * Bump Home Assistant base image version from 2.18 to 3.21 @@ -63,6 +37,35 @@ * change validation of identifiers to no longer accept unusual characters * change default device connection to be resolved automatically via mDNS + +# next (tbd) +## Home Assistant Add-on + +### Features +* Add Home Assistant Ingress (Web UI) [#147](https://github.com/LukasGrebe/ha-addons/issues/147) +* Colorize Logo to identify Add-on as running in Home Assistant [#81](https://github.com/LukasGrebe/ha-addons/issues/81) +* Easier custom MQTT device configuration [#162](https://github.com/LukasGrebe/ha-addons/issues/162) +* Include configuration files with Add-on Backups by following [HA Changes](https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/) [#160](https://github.com/LukasGrebe/ha-addons/issues/160) + +### Improvements +* Drastically reduce Settings UI [#85](https://github.com/LukasGrebe/ha-addons/issues/85) +* Increase security classification by creating an apparmor profile [#83](https://github.com/LukasGrebe/ha-addons/issues/83) +* Update documentation [#146](https://github.com/LukasGrebe/ha-addons/issues/146) + +## [ebusd](https://github.com/john30/ebusd/blob/master/ChangeLog.md) +### Bug Fixes +* fix for device string symlink with colon +* fix "read" and "write" command response +* fix dump of divisor +* fix max value for S3N, S3N, SLG, and SLR types +* fix socket options for KNXnet/IP integration + +### Features +* add "-m" option to "encode" and "decode" commands +* add output for commands executed with "--inject=stop" + +# Older Releases + ## 23.2.6 - Update HEALTHCHECK in Dockerfile to not use DNS [#126](https://github.com/LukasGrebe/ha-addons/issues/126) thanks @StCyr diff --git a/ebusd/README.md b/ebusd/README.md index 69fedc3..0f2148b 100644 --- a/ebusd/README.md +++ b/ebusd/README.md @@ -20,9 +20,8 @@ Many issues result from incomplete [ebusd configuration](https://github.com/john ## Versioning Scheme This add-on is versioned in a way that [mirrors the `ebusd` version](https://github.com/john30/ebusd/releases). -Addon specific iterations are denoted by a pre-release identifier (e.g., `-ha-addon.1`). +Addon specific iterations are denoted by the patch number. -- **Major.Minor.Patch**: Mirrors the [corresponding `ebusd` version](https://github.com/john30/ebusd/releases). -- **Pre-release Identifier**: Used to denote add-on-specific iterations (e.g., `-ha-addon.1`). +- **.. **: Mirrors the [corresponding `ebusd` version](https://github.com/john30/ebusd/releases). while the `Addon-specific Iteration` denote add-on-specific iterations. -**Example**: `24.1.1-ha-addon.1` +**Example**: `24.1.1` diff --git a/ebusd/config.yaml b/ebusd/config.yaml index 0f67951..d0bfaf0 100644 --- a/ebusd/config.yaml +++ b/ebusd/config.yaml @@ -1,5 +1,5 @@ name: eBUSd -version: "24.1.1-ha-addon.1" +version: "24.1.1" slug: ebusd description: > This Add-on runs eBUSd, a daemon for handling communication with eBUS devices