From 0bface5e3f1b61c3a59674e2900ccaaa5209a622 Mon Sep 17 00:00:00 2001 From: BIBOLV <49994376+BIBOLV@users.noreply.github.com> Date: Sun, 16 May 2021 22:24:20 +0300 Subject: [PATCH] snap update Update snap Remove README - moved to https://weetmuts.github.io/wmbusmeterswiki/SNAP.html --- snap/README.md | 65 --------------------------------------------- snap/snapcraft.yaml | 20 +++++++++++++- 2 files changed, 19 insertions(+), 66 deletions(-) delete mode 100644 snap/README.md diff --git a/snap/README.md b/snap/README.md deleted file mode 100644 index 6b19fdb..0000000 --- a/snap/README.md +++ /dev/null @@ -1,65 +0,0 @@ -Installation of snapd -=============================== - -Please refer to official documentation for snapd installation - https://snapcraft.io/docs/installing-snapd - -Installation of wmbusmeters Snap -=============================== - -Installing a snap is straightforward: - - sudo snap install wmbusmeters - -The stable channel is used by default, but opting to install from a edge channel is easily accomplished: - - sudo snap install --channel=edge wmbusmeters - -In stable channel latest releases of wmbusmeters will be available, but in edge channel wmbusmeters snap will contain all latest code changes. - -Using the wmbusmeters Snap -=============================== - -After installing the Snap, the privileged access to USB interfaces need to be configured: - - sudo snap connect wmbusmeters:raw-usb core:raw-usb - sudo snap connect wmbusmeters:system-observe core:system-observe - -Using wmbusmeters Daemon -------------------------------------------- - -For all actions with wmbusmeters daemon, like enable/disable/start/stop/restart/status -systemctl commands should be used - -For example: - - systemctl start snap.wmbusmeters.wmbusmeters.service - systemctl status snap.wmbusmeters.wmbusmeters.service - -Configuration for wmbusmeters ------------------------------ - -Configuration of wmbusmeters is located in - `/var/snap/wmbusmeters/common/etc/` - -Logs are in - `/var/snap/wmbusmeters/common/logs/` - -When changes are made to configuration, service must be restarted. - -Those directories are persistent across updates - files will not be deleted or changed when updating snap. -Files and directories are being deleted only when snap is removed. - -When using rtlwmbus, rtl433 or shell commands then LD_LIBRARY_PATH and full path to binary inside snap should be used. - -In case of rtlwmbus following configuration should be used: - - device=rtlwmbus:CMD(LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:/snap/wmbusmeters/current/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/usr/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/lib:/snap/wmbusmeters/current/usr/lib:/snap/wmbusmeters/current/usr/lib/arm-linux-gnueabihf /snap/wmbusmeters/current/usr/bin/rtl_sdr -f 868.95M -s 1600000 - 2>/dev/null | /snap/wmbusmeters/current/usr/bin/rtl_wmbus) - - or rtl433 - - device=rtl433:CMD(LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:/snap/wmbusmeters/current/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/usr/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/lib:/snap/wmbusmeters/current/usr/lib:/snap/wmbusmeters/current/usr/lib/arm-linux-gnueabihf /snap/wmbusmeters/current/usr/bin/rtl_433 -F csv -f 868.95M) - - or when shell command is being used - - shell=LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:/snap/wmbusmeters/current/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/usr/lib/x86_64-linux-gnu:/snap/wmbusmeters/current/lib:/snap/wmbusmeters/current/usr/lib:/snap/wmbusmeters/current/usr/lib/arm-linux-gnueabihf /snap/wmbusmeters/current/usr/bin/mosquitto_pub -h localhost -t wmbusmeters/$METER_ID -m "$METER_JSON" - diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 13631d8..b320830 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -95,5 +95,23 @@ apps: - system-observe layout: + /usr/bin/curl: + bind-file: $SNAP/usr/bin/curl + /usr/bin/mosquitto_pub: + bind-file: $SNAP/usr/bin/mosquitto_pub + /usr/bin/mosquitto_sub: + bind-file: $SNAP/usr/bin/mosquitto_sub + /usr/bin/rtl_433: + bind-file: $SNAP/usr/bin/rtl_433 + /usr/bin/rtl_sdr: + bind-file: $SNAP/usr/bin/rtl_sdr + /usr/bin/rtl_wmbus: + bind-file: $SNAP/usr/bin/rtl_wmbus + /usr/bin/wmbusmeters: + bind-file: $SNAP/usr/bin/wmbusmeters /sbin/killall5: - bind-file: $SNAP/sbin/killall5 \ No newline at end of file + bind-file: $SNAP/sbin/killall5 + /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/librtlsdr.so.0: + symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/librtlsdr.so.0 + /lib/$SNAPCRAFT_ARCH_TRIPLET/libusb-1.0.so.0: + symlink: $SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET/libusb-1.0.so.0 \ No newline at end of file