From 40764118789f79f79e943a95b805db4e929ec5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 17:18:42 +0200 Subject: Tweak bigclown packages --- bigclown-control-tools/Makefile | 15 +++--- bigclown-control-tools/files/bch | 9 ++++ bigclown-gateway/Makefile | 20 ++++---- .../files/bc-gateway-usb-dongle.config | 9 ---- bigclown-gateway/files/bc-gateway-usb-dongle.init | 59 ---------------------- bigclown-gateway/files/bcg | 9 ++++ bigclown-gateway/files/config | 9 ++++ bigclown-gateway/files/init | 57 +++++++++++++++++++++ bigclown-gateway/files/udev | 1 + bigclown-mqtt2influxdb/Makefile | 28 ++++++++++ bigclown-mqtt2influxdb/files/init | 57 +++++++++++++++++++++ bigclown-mqtt2influxdb/files/mqtt2influxdb | 9 ++++ 12 files changed, 195 insertions(+), 87 deletions(-) create mode 100755 bigclown-control-tools/files/bch delete mode 100644 bigclown-gateway/files/bc-gateway-usb-dongle.config delete mode 100755 bigclown-gateway/files/bc-gateway-usb-dongle.init create mode 100755 bigclown-gateway/files/bcg create mode 100644 bigclown-gateway/files/config create mode 100755 bigclown-gateway/files/init create mode 100644 bigclown-gateway/files/udev create mode 100644 bigclown-mqtt2influxdb/Makefile create mode 100644 bigclown-mqtt2influxdb/files/init create mode 100755 bigclown-mqtt2influxdb/files/mqtt2influxdb diff --git a/bigclown-control-tools/Makefile b/bigclown-control-tools/Makefile index c11aea7..723e29a 100644 --- a/bigclown-control-tools/Makefile +++ b/bigclown-control-tools/Makefile @@ -1,14 +1,7 @@ -# -## Copyright (C) 2016-2017 CZ.NIC z.s.p.o. (http://www.nic.cz/) -# -## This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# # -# include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-control-tools -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-control-tool.git PKG_MAINTAINER:=Karel Kočí @@ -21,7 +14,13 @@ define Package/$(PKG_NAME) DEPENDS:=+python3 endef +define Py3Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/bch $(1)/usr/bin/bch +endef + define Build/Compile + sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) endef diff --git a/bigclown-control-tools/files/bch b/bigclown-control-tools/files/bch new file mode 100755 index 0000000..a473b30 --- /dev/null +++ b/bigclown-control-tools/files/bch @@ -0,0 +1,9 @@ +#!/usr/bin/python3.6 +import bch +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('bch', 'console_scripts', 'bch')() + ) diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index 60f659a..1fb8937 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,14 +1,7 @@ -# -## Copyright (C) 2016-2017 CZ.NIC z.s.p.o. (http://www.nic.cz/) -# -## This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# # -# include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí @@ -22,17 +15,22 @@ define Package/$(PKG_NAME) endef define Py3Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/bcg $(1)/usr/bin/bcg $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/bc-gateway-usb-dongle.config $(1)/etc/config/bc-gateway-usb-dongle + $(INSTALL_CONF) ./files/config $(1)/etc/config/bigclown-gateway $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/bc-gateway-usb-dongle.init $(1)/etc/init.d/bc-gateway-usb-dongle.init + $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bigclown-gateway + $(INSTALL_DIR) $(1)/etc/udev/rules.d + $(INSTALL_DATA) ./files/udev $(1)/etc/udev/rules.d/58-bigclown-usb-dongle.rules endef define Package/$(PKG_NAME)/conffiles -/etc/config/bc-gateway-usb-dongle +/etc/config/bigclown-gateway endef define Build/Compile + sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) endef diff --git a/bigclown-gateway/files/bc-gateway-usb-dongle.config b/bigclown-gateway/files/bc-gateway-usb-dongle.config deleted file mode 100644 index 7fa3977..0000000 --- a/bigclown-gateway/files/bc-gateway-usb-dongle.config +++ /dev/null @@ -1,9 +0,0 @@ - -config config 'gateway' - option name 'usb-dongle' - option device '/dev/ttyUSB0' - option automatic_rename_kit_nodes '1' - -config config 'mqtt' - option host 'localhost' - option port '1883' diff --git a/bigclown-gateway/files/bc-gateway-usb-dongle.init b/bigclown-gateway/files/bc-gateway-usb-dongle.init deleted file mode 100755 index bae6d11..0000000 --- a/bigclown-gateway/files/bc-gateway-usb-dongle.init +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=1 - -USE_PROCD=1 - -PROG=/usr/bin/bcg - -CONF=/tmp/bc-gateway-usb-dongle.generated.conf - -UCI_STARTED= -UCI_DISABLED= - -append() { - local cfg="$1" - local uci_name="$2" - local out_name="$3" - local default="$4" - config_get val $cfg $uci_name $default - if [ -n "$val" ]; then - echo "$out_name $val" >> $CONF - fi -} - -start_service() { - config_load bc-gateway-usb-dongle - - rm -rf $CONF - echo "Generating bc-gateway-usb-dongle config file in $CONF" - - append gateway name 'name:' usb-dongle - append gateway device 'device:' /dev/ttyUSB0 - append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 - append gateway base_topic_prefix 'base_topic_prefix:' - - echo "mqtt:" >> $CONF - - append mqtt host ' host:' localhost - append mqtt port ' port:' 1883 - append mqtt cafile ' cafile:' - append mqtt certfile ' certfile:' - append mqtt keyfile ' keyfile:' - - procd_open_instance - procd_set_param respawn - procd_set_param command "$PROG" -c "$CONF" -W - procd_close_instance -} - -stop_service() { - service_stop "$PROG" - ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 -} - -service_triggers() -{ - procd_add_reload_trigger 'bc-gateway-usb-dongle' -} diff --git a/bigclown-gateway/files/bcg b/bigclown-gateway/files/bcg new file mode 100755 index 0000000..fe261f4 --- /dev/null +++ b/bigclown-gateway/files/bcg @@ -0,0 +1,9 @@ +#!/usr/bin/python3.6 +import bcg +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('bcg', 'console_scripts', 'bcg')() + ) diff --git a/bigclown-gateway/files/config b/bigclown-gateway/files/config new file mode 100644 index 0000000..7fa3977 --- /dev/null +++ b/bigclown-gateway/files/config @@ -0,0 +1,9 @@ + +config config 'gateway' + option name 'usb-dongle' + option device '/dev/ttyUSB0' + option automatic_rename_kit_nodes '1' + +config config 'mqtt' + option host 'localhost' + option port '1883' diff --git a/bigclown-gateway/files/init b/bigclown-gateway/files/init new file mode 100755 index 0000000..090cc06 --- /dev/null +++ b/bigclown-gateway/files/init @@ -0,0 +1,57 @@ +#!/bin/sh /etc/rc.common + +START=98 +STOP=1 + +USE_PROCD=1 + +PROG=/usr/bin/bcg +CONF=/tmp/etc/bigclown-gateway.conf + +append() { + local cfg="$1" + local uci_name="$2" + local out_name="$3" + local default="$4" + config_get val $cfg $uci_name $default + if [ -n "$val" ]; then + echo "$out_name $val" >> $CONF + fi +} + +start_service() { + config_load bigclown-gateway + + rm -rf $CONF + echo "Generating bigclown-gateway config file in $CONF" + + append gateway name 'name:' usb-dongle + # TODO add udev rules and use different default here + append gateway device 'device:' /dev/ttyUSB0 + append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 + append gateway base_topic_prefix 'base_topic_prefix:' + + echo "mqtt:" >> $CONF + append mqtt host ' host:' localhost + append mqtt port ' port:' 1883 + append mqtt cafile ' cafile:' + append mqtt certfile ' certfile:' + append mqtt keyfile ' keyfile:' + + procd_open_instance + procd_set_param respawn + procd_set_param command "$PROG" -c "$CONF" -W + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance +} + +stop_service() { + service_stop "$PROG" + ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 +} + +service_triggers() +{ + procd_add_reload_trigger 'bc-gateway-usb-dongle' +} diff --git a/bigclown-gateway/files/udev b/bigclown-gateway/files/udev new file mode 100644 index 0000000..d7a854b --- /dev/null +++ b/bigclown-gateway/files/udev @@ -0,0 +1 @@ +SUBSYSTEMS=="usb", ACTION=="add", KERNEL=="ttyUSB*", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", ATTRS{serial}=="bc-usb-dongle*", SYMLINK+="bcUD%n", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/bcUD%n" diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile new file mode 100644 index 0000000..760751f --- /dev/null +++ b/bigclown-mqtt2influxdb/Makefile @@ -0,0 +1,28 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=bigclown-mqtt2influxdb +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git +PKG_MAINTAINER:=Karel Kočí + +include $(TOPDIR)/package/autopkg-tag.mk +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=BigCLown MQTT to Influxdb bridge + DEPENDS:=+python3 +python3-paho-mqtt +endef + +define Py3Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/mqtt2influxdb $(1)/usr/bin/mqtt2influxdb +endef + +define Build/Compile + sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init new file mode 100644 index 0000000..f9efc0e --- /dev/null +++ b/bigclown-mqtt2influxdb/files/init @@ -0,0 +1,57 @@ +#!/bin/sh /etc/rc.common + +START=99 +STOP=1 + +USE_PROCD=1 + +PROG=/usr/bin/mqtt2influxdb +CONF=/tmp/etc/bc-mqtt2influxdb.conf + +append() { + local cfg="$1" + local uci_name="$2" + local out_name="$3" + local default="$4" + config_get val $cfg $uci_name $default + if [ -n "$val" ]; then + echo "$out_name $val" >> $CONF + fi +} + +start_service() { + config_load bc-gateway-usb-dongle + + rm -rf $CONF + echo "Generating bc-gateway-usb-dongle config file in $CONF" + + append gateway name 'name:' usb-dongle + append gateway device 'device:' /dev/ttyUSB0 + append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 + append gateway base_topic_prefix 'base_topic_prefix:' + + echo "mqtt:" >> $CONF + + append mqtt host ' host:' localhost + append mqtt port ' port:' 1883 + append mqtt cafile ' cafile:' + append mqtt certfile ' certfile:' + append mqtt keyfile ' keyfile:' + + procd_open_instance + procd_set_param respawn + procd_set_param command "$PROG" -c "$CONF" --debug + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance +} + +stop_service() { + service_stop "$PROG" + ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 +} + +service_triggers() +{ + procd_add_reload_trigger 'bc-gateway-usb-dongle' +} diff --git a/bigclown-mqtt2influxdb/files/mqtt2influxdb b/bigclown-mqtt2influxdb/files/mqtt2influxdb new file mode 100755 index 0000000..22f9f8c --- /dev/null +++ b/bigclown-mqtt2influxdb/files/mqtt2influxdb @@ -0,0 +1,9 @@ +#!/usr/bin/python3.6 +import mqtt2influxdb +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('mqtt2influxdb', 'console_scripts', 'mqtt2influxdb')() + ) -- cgit v1.2.3 From dab9c4f6f89f4d1b8817375fdb30f0c2cf951989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 17:36:47 +0200 Subject: bigclown-gateway: move udev rules --- bigclown-gateway/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index 1fb8937..f5de297 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí @@ -21,8 +21,8 @@ define Py3Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/config $(1)/etc/config/bigclown-gateway $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bigclown-gateway - $(INSTALL_DIR) $(1)/etc/udev/rules.d - $(INSTALL_DATA) ./files/udev $(1)/etc/udev/rules.d/58-bigclown-usb-dongle.rules + $(INSTALL_DIR) $(1)/lib/udev/rules.d/ + $(INSTALL_DATA) ./files/udev $(1)/lib/udev/rules.d/58-bigclown-usb-dongle.rules endef define Package/$(PKG_NAME)/conffiles -- cgit v1.2.3 From ba6eb4bfe3ab05685ae1289b10b04c9bf8112e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 22:09:25 +0200 Subject: bigclown-gateway: Try to fix udev rule and change path --- bigclown-gateway/Makefile | 2 +- bigclown-gateway/files/config | 2 +- bigclown-gateway/files/init | 2 +- bigclown-gateway/files/udev | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index f5de297..4c41fc5 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí diff --git a/bigclown-gateway/files/config b/bigclown-gateway/files/config index 7fa3977..d880476 100644 --- a/bigclown-gateway/files/config +++ b/bigclown-gateway/files/config @@ -1,7 +1,7 @@ config config 'gateway' option name 'usb-dongle' - option device '/dev/ttyUSB0' + option device '/dev/bcUD0' option automatic_rename_kit_nodes '1' config config 'mqtt' diff --git a/bigclown-gateway/files/init b/bigclown-gateway/files/init index 090cc06..28f6e7e 100755 --- a/bigclown-gateway/files/init +++ b/bigclown-gateway/files/init @@ -27,7 +27,7 @@ start_service() { append gateway name 'name:' usb-dongle # TODO add udev rules and use different default here - append gateway device 'device:' /dev/ttyUSB0 + append gateway device 'device:' /dev/bcUD0 append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 append gateway base_topic_prefix 'base_topic_prefix:' diff --git a/bigclown-gateway/files/udev b/bigclown-gateway/files/udev index d7a854b..5409c56 100644 --- a/bigclown-gateway/files/udev +++ b/bigclown-gateway/files/udev @@ -1 +1 @@ -SUBSYSTEMS=="usb", ACTION=="add", KERNEL=="ttyUSB*", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", ATTRS{serial}=="bc-usb-dongle*", SYMLINK+="bcUD%n", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/bcUD%n" +SUBSYSTEMS=="usb", ACTION=="add", KERNEL=="ttyUSB*", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", ATTRS{serial}=="bc-usb-dongle*", SYMLINK+="bcUD%n" -- cgit v1.2.3 From 799af4541927be9b3b190c0a6d0c97e0bb2fc943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 22:15:18 +0200 Subject: Try to fix more bigclown packages --- bigclown-control-tools/Makefile | 4 ++-- bigclown-mqtt2influxdb/Makefile | 2 +- click-log/Makefile | 22 ++++++++++++++++++++++ click/Makefile | 22 ++++++++++++++++++++++ python3-influxdb/Makefile | 22 ++++++++++++++++++++++ python3-influxdb/files/bch | 9 +++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 click-log/Makefile create mode 100644 click/Makefile create mode 100644 python3-influxdb/Makefile create mode 100755 python3-influxdb/files/bch diff --git a/bigclown-control-tools/Makefile b/bigclown-control-tools/Makefile index 723e29a..cf5fffc 100644 --- a/bigclown-control-tools/Makefile +++ b/bigclown-control-tools/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-control-tools -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-control-tool.git PKG_MAINTAINER:=Karel Kočí @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown control tools - DEPENDS:=+python3 + DEPENDS:=+python3 +click-log +python3-influxdb endef define Py3Package/$(PKG_NAME)/install diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 760751f..678461f 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt + DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb endef define Py3Package/$(PKG_NAME)/install diff --git a/click-log/Makefile b/click-log/Makefile new file mode 100644 index 0000000..76c8507 --- /dev/null +++ b/click-log/Makefile @@ -0,0 +1,22 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=click-log +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/click-contrib/click-log.git +PKG_MAINTAINER:=Karel Kočí + +include $(TOPDIR)/package/autopkg-tag.mk +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Simple and beautiful logging for click applications + DEPENDS:=+python3 +click +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/click/Makefile b/click/Makefile new file mode 100644 index 0000000..d226f5c --- /dev/null +++ b/click/Makefile @@ -0,0 +1,22 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=click +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/pallets/click.git +PKG_MAINTAINER:=Karel Kočí + +include $(TOPDIR)/package/autopkg-tag.mk +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Python composable command line utility + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-influxdb/Makefile b/python3-influxdb/Makefile new file mode 100644 index 0000000..7cdd0cb --- /dev/null +++ b/python3-influxdb/Makefile @@ -0,0 +1,22 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-influxdb +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/influxdata/influxdb-python.git +PKG_MAINTAINER:=Karel Kočí + +include $(TOPDIR)/package/autopkg-tag.mk +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Python client for InfluxDB + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-influxdb/files/bch b/python3-influxdb/files/bch new file mode 100755 index 0000000..a473b30 --- /dev/null +++ b/python3-influxdb/files/bch @@ -0,0 +1,9 @@ +#!/usr/bin/python3.6 +import bch +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('bch', 'console_scripts', 'bch')() + ) -- cgit v1.2.3 From b801bd3cc5dec9df8a8742d3f6d6f59a46ae5e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 22:46:21 +0200 Subject: Fix click --- click-log/Makefile | 6 ++++-- click/Makefile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/click-log/Makefile b/click-log/Makefile index 76c8507..0193c3d 100644 --- a/click-log/Makefile +++ b/click-log/Makefile @@ -1,11 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=click-log +PKG_VERSION:=0.3.2 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/click-contrib/click-log.git +PKG_SOURCE_URL:=https://github.com/click-contrib/click-log/archive/$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MDSUM:=fd9f23b5644c093c045a25c176f00686 PKG_MAINTAINER:=Karel Kočí -include $(TOPDIR)/package/autopkg-tag.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) diff --git a/click/Makefile b/click/Makefile index d226f5c..438f14a 100644 --- a/click/Makefile +++ b/click/Makefile @@ -1,11 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=click +PKG_VERSION:=6.7 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/pallets/click.git +PKG_SOURCE_URL:=https://github.com/pallets/click/archive/$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MDSUM:=fc4cc00c4863833230d3af92af48abd4 PKG_MAINTAINER:=Karel Kočí -include $(TOPDIR)/package/autopkg-tag.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From 5b0c2421d6ca596154d03b8994680e58e52846c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 23:59:58 +0200 Subject: bigclown-gateway: replace udev with hotplug --- bigclown-gateway/Makefile | 6 +++--- bigclown-gateway/files/hotplug | 32 ++++++++++++++++++++++++++++++++ bigclown-gateway/files/udev | 1 - 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 bigclown-gateway/files/hotplug delete mode 100644 bigclown-gateway/files/udev diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index 4c41fc5..17bcbae 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí @@ -21,8 +21,8 @@ define Py3Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/config $(1)/etc/config/bigclown-gateway $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bigclown-gateway - $(INSTALL_DIR) $(1)/lib/udev/rules.d/ - $(INSTALL_DATA) ./files/udev $(1)/lib/udev/rules.d/58-bigclown-usb-dongle.rules + $(INSTALL_DIR) $(1)/etc/hotplug.d/usb + $(INSTALL_DATA) ./files/hotplug $(1)/etc/hotplug.d/usb/50-bigclown-usb-dongle endef define Package/$(PKG_NAME)/conffiles diff --git a/bigclown-gateway/files/hotplug b/bigclown-gateway/files/hotplug new file mode 100644 index 0000000..fb1ef59 --- /dev/null +++ b/bigclown-gateway/files/hotplug @@ -0,0 +1,32 @@ +#!/bin/sh +DEVNAME="$(ls "/sys/$DEVPATH" | grep "^ttyUSB[0-9]*$")" +[ -n "$DEVNAME" ] || exit 0 +[ "$ID_VENDOR" = "0403" ] || exit 0 +[ "$ID_MODEL" = "6015" ] || exit 0 +echo "$ID_SERIAL" | grep -q ".*bc-usb-dongle.*" || exit 0 + +action_add() { + local id=0 + while [ -e "/dev/bcUD$id" ]; do + id=$(expr $id + 1) + done + ln -sf "/dev/$DEVNAME" "/dev/bcUD$id" +} + +action_remove() { + local id=0 + while [ "$(readlink "/dev/bcUD$id")" = "$DEVNAME" ]; do + [ -e "/dev/bcUD$id" ] || return 0 + id=$(expr $id + 1) + done + rm "/dev/bcUD$id" +} + +case "$ACTION" in + add) + action_add + ;; + remove) + action_remove + ;; +esac diff --git a/bigclown-gateway/files/udev b/bigclown-gateway/files/udev deleted file mode 100644 index 5409c56..0000000 --- a/bigclown-gateway/files/udev +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEMS=="usb", ACTION=="add", KERNEL=="ttyUSB*", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", ATTRS{serial}=="bc-usb-dongle*", SYMLINK+="bcUD%n" -- cgit v1.2.3 From f92e15fbe52427e51260f60fe902da18ae85fd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 00:17:08 +0200 Subject: bigclown-gateway: ok no device link It seems to not work so just drop it. --- bigclown-gateway/Makefile | 4 +--- bigclown-gateway/files/config | 2 +- bigclown-gateway/files/hotplug | 32 -------------------------------- bigclown-gateway/files/init | 2 +- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 bigclown-gateway/files/hotplug diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index 17bcbae..df17fd6 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=5 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí @@ -21,8 +21,6 @@ define Py3Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/config $(1)/etc/config/bigclown-gateway $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bigclown-gateway - $(INSTALL_DIR) $(1)/etc/hotplug.d/usb - $(INSTALL_DATA) ./files/hotplug $(1)/etc/hotplug.d/usb/50-bigclown-usb-dongle endef define Package/$(PKG_NAME)/conffiles diff --git a/bigclown-gateway/files/config b/bigclown-gateway/files/config index d880476..7fa3977 100644 --- a/bigclown-gateway/files/config +++ b/bigclown-gateway/files/config @@ -1,7 +1,7 @@ config config 'gateway' option name 'usb-dongle' - option device '/dev/bcUD0' + option device '/dev/ttyUSB0' option automatic_rename_kit_nodes '1' config config 'mqtt' diff --git a/bigclown-gateway/files/hotplug b/bigclown-gateway/files/hotplug deleted file mode 100644 index fb1ef59..0000000 --- a/bigclown-gateway/files/hotplug +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -DEVNAME="$(ls "/sys/$DEVPATH" | grep "^ttyUSB[0-9]*$")" -[ -n "$DEVNAME" ] || exit 0 -[ "$ID_VENDOR" = "0403" ] || exit 0 -[ "$ID_MODEL" = "6015" ] || exit 0 -echo "$ID_SERIAL" | grep -q ".*bc-usb-dongle.*" || exit 0 - -action_add() { - local id=0 - while [ -e "/dev/bcUD$id" ]; do - id=$(expr $id + 1) - done - ln -sf "/dev/$DEVNAME" "/dev/bcUD$id" -} - -action_remove() { - local id=0 - while [ "$(readlink "/dev/bcUD$id")" = "$DEVNAME" ]; do - [ -e "/dev/bcUD$id" ] || return 0 - id=$(expr $id + 1) - done - rm "/dev/bcUD$id" -} - -case "$ACTION" in - add) - action_add - ;; - remove) - action_remove - ;; -esac diff --git a/bigclown-gateway/files/init b/bigclown-gateway/files/init index 28f6e7e..090cc06 100755 --- a/bigclown-gateway/files/init +++ b/bigclown-gateway/files/init @@ -27,7 +27,7 @@ start_service() { append gateway name 'name:' usb-dongle # TODO add udev rules and use different default here - append gateway device 'device:' /dev/bcUD0 + append gateway device 'device:' /dev/ttyUSB0 append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 append gateway base_topic_prefix 'base_topic_prefix:' -- cgit v1.2.3 From b126c613959c119f6a57123bd921c2a5395767a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 00:32:43 +0200 Subject: Add python3-jsonpath-ng --- bigclown-mqtt2influxdb/Makefile | 2 +- python3-jsonpath-ng/Makefile | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 python3-jsonpath-ng/Makefile diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 678461f..d8b6405 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb + DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb +python3-jsonpath-ng endef define Py3Package/$(PKG_NAME)/install diff --git a/python3-jsonpath-ng/Makefile b/python3-jsonpath-ng/Makefile new file mode 100644 index 0000000..14de303 --- /dev/null +++ b/python3-jsonpath-ng/Makefile @@ -0,0 +1,24 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-jsonpath-ng +PKG_VERSION:=1.4.2 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/h2non/jsonpath-ng/archive/v$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MDSUM:=aa3162e145a7c5cab58662f49db7aecf +PKG_MAINTAINER:=Karel Kočí + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Python composable command line utility + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) -- cgit v1.2.3 From 65fe9416ff0d1d4ba3aeaaf5bb462f401d054a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 00:45:38 +0200 Subject: python3-jsonpath-ng: fix --- python3-jsonpath-ng/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/python3-jsonpath-ng/Makefile b/python3-jsonpath-ng/Makefile index 14de303..f0393fb 100644 --- a/python3-jsonpath-ng/Makefile +++ b/python3-jsonpath-ng/Makefile @@ -7,6 +7,7 @@ PKG_SOURCE_URL:=https://github.com/h2non/jsonpath-ng/archive/v$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MDSUM:=aa3162e145a7c5cab58662f49db7aecf PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/jsonpath-ng-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From 69d5be040af236f07e8d4abeba9ae52732a80c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 10:43:44 +0200 Subject: Add python3-schema --- python3-schema/Makefile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 python3-schema/Makefile diff --git a/python3-schema/Makefile b/python3-schema/Makefile new file mode 100644 index 0000000..8fd5c8e --- /dev/null +++ b/python3-schema/Makefile @@ -0,0 +1,25 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-schema +PKG_VERSION:=0.7.2 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/keleshev/schema/archive/v$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MDSUM:=d3f3ebab4939b18ea299f63fe64ce7f9 +PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/schema-v$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Schema validation just got Pythonic + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) -- cgit v1.2.3 From c1f050cc243ada614ba984c9ad3072700e9fd14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 10:50:25 +0200 Subject: python3-jsonpath-ng: bump to new version Upstream seem to have forgotten to tag new version in git. --- python3-jsonpath-ng/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python3-jsonpath-ng/Makefile b/python3-jsonpath-ng/Makefile index f0393fb..445c743 100644 --- a/python3-jsonpath-ng/Makefile +++ b/python3-jsonpath-ng/Makefile @@ -1,13 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-jsonpath-ng -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.4.3 +PKG_GIT_VERSION:=003a0b78f8a1857aa7027a837def54564a2b578a PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/h2non/jsonpath-ng/archive/v$(PKG_VERSION)/ +PKG_SOURCE_URL:=https://github.com/h2non/jsonpath-ng/archive/$(PKG_GIT_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MDSUM:=aa3162e145a7c5cab58662f49db7aecf +PKG_MDSUM:=bcc11792f1877b60ad267b7eb3c1e3b6 PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/jsonpath-ng-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/jsonpath-ng-$(PKG_GIT_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From abd0770f558ba71fbea2f56b44caebce0ae134be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 10:54:43 +0200 Subject: bigclown-mqtt2influxdb: add dependencies --- bigclown-mqtt2influxdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index d8b6405..0fe33dd 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb +python3-jsonpath-ng + DEPENDS:=+python3 +python3-paho-mqtt +python3-pyyaml +python3-influxdb +python3-jsonpath-ng +python3-schema endef define Py3Package/$(PKG_NAME)/install -- cgit v1.2.3 From a0e3148c8e1b70ea61159d8cd0c8d9692945c8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 11:25:11 +0200 Subject: python3-schema: fix compilation --- python3-schema/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-schema/Makefile b/python3-schema/Makefile index 8fd5c8e..fd3811a 100644 --- a/python3-schema/Makefile +++ b/python3-schema/Makefile @@ -7,7 +7,7 @@ PKG_SOURCE_URL:=https://github.com/keleshev/schema/archive/v$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MDSUM:=d3f3ebab4939b18ea299f63fe64ce7f9 PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/schema-v$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/schema-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From e3325d08c8e682c10db517cdd703176380f80381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 11:41:47 +0200 Subject: Add python3-decorator --- python3-decorator/Makefile | 24 ++++++++++++++++++++++++ python3-jsonpath-ng/Makefile | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 python3-decorator/Makefile diff --git a/python3-decorator/Makefile b/python3-decorator/Makefile new file mode 100644 index 0000000..49e9d80 --- /dev/null +++ b/python3-decorator/Makefile @@ -0,0 +1,24 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-decorator +PKG_VERSION:=4.3.1 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/micheles/decorator/archive/$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MDSUM:=b92084f8732267b9ea5bfe8887fbad14 +PKG_MAINTAINER:=Karel Kočí + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Schema validation just got Pythonic + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-jsonpath-ng/Makefile b/python3-jsonpath-ng/Makefile index 445c743..78bc42a 100644 --- a/python3-jsonpath-ng/Makefile +++ b/python3-jsonpath-ng/Makefile @@ -15,7 +15,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=Python composable command line utility - DEPENDS:=+python3 + DEPENDS:=+python3 +python3-ply +python3-six +python3-decorator endef define Build/Compile -- cgit v1.2.3 From 3827aa391d6efc91cc59f903fd29460a44ed908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 11:44:00 +0200 Subject: python3-decorator: fix --- python3-decorator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-decorator/Makefile b/python3-decorator/Makefile index 49e9d80..03d34a3 100644 --- a/python3-decorator/Makefile +++ b/python3-decorator/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) - TITLE:=Schema validation just got Pythonic + TITLE:=Python3 decorators DEPENDS:=+python3 endef -- cgit v1.2.3 From eedc2cda3c3df22f882fee9c45f52a9dd24cc1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 12:56:50 +0200 Subject: python3-decorator: fix build --- python3-decorator/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/python3-decorator/Makefile b/python3-decorator/Makefile index 03d34a3..aefd6d2 100644 --- a/python3-decorator/Makefile +++ b/python3-decorator/Makefile @@ -7,6 +7,7 @@ PKG_SOURCE_URL:=https://github.com/micheles/decorator/archive/$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MDSUM:=b92084f8732267b9ea5bfe8887fbad14 PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/decorator-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From 5e0641470fb4989671969ef3ffd5aca97e3dfd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 14:38:36 +0200 Subject: Try python3-six updated version --- python3-six/Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 python3-six/Makefile diff --git a/python3-six/Makefile b/python3-six/Makefile new file mode 100644 index 0000000..dfa662d --- /dev/null +++ b/python3-six/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-six +PKG_VERSION:=1.11.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=six-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/six/ +PKG_MD5SUM:=d12789f9baf7e9fb2524c0c64f1773f8 + +PKG_BUILD_DIR:=$(BUILD_DIR)/six-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=python3-setuptools + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/python3-six + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Python 2 and 3 compatibility utilities + URL:=http://pypi.python.org/pypi/six/ + DEPENDS:=+python3 +endef + +define Package/python3-six/description + Python 2 and 3 compatibility utilities +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,, \ + install --root="$(PKG_INSTALL_DIR)" --prefix="/usr" \ + --single-version-externally-managed \ + ) +endef + +$(eval $(call Py3Package,python3-six)) +$(eval $(call BuildPackage,python3-six)) -- cgit v1.2.3 From 79ecb07a3ce224b574e9cdfc1fe264d8a4902cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 14:44:52 +0200 Subject: python3-reqiest: update to new version --- python3-requests/Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 python3-requests/Makefile diff --git a/python3-requests/Makefile b/python3-requests/Makefile new file mode 100644 index 0000000..bd43a33 --- /dev/null +++ b/python3-requests/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-requests +PKG_VERSION:=2.19.1 +PKG_RELEASE:=2 + +PKG_SOURCE:=requests-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/r/requests/ +PKG_MD5SUM:=6c1a31afec9d614e2e71a91ee6ca2878 + +PKG_BUILD_DIR:=$(BUILD_DIR)/requests-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=python3-setuptools + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/python3-requests + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Python HTTP for Humans. + URL:=http://python-requests.org + DEPENDS:=+python3 +endef + +define Package/python3-requests/description + Python HTTP for Humans. +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,, \ + install --root="$(PKG_INSTALL_DIR)" --prefix="/usr" \ + --single-version-externally-managed \ + ) +endef + +$(eval $(call Py3Package,python3-requests)) +$(eval $(call BuildPackage,python3-requests)) -- cgit v1.2.3 From 5b51fb7fe1ffd717eb83738102eda2c907a5636f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 15:03:02 +0200 Subject: Add some missing dependencies for influxdb --- python3-dateutil/Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ python3-influxdb/Makefile | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 python3-dateutil/Makefile diff --git a/python3-dateutil/Makefile b/python3-dateutil/Makefile new file mode 100644 index 0000000..f1ad0d3 --- /dev/null +++ b/python3-dateutil/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-dateutil +PKG_VERSION:=2.7.3 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/r/python-dateutil/ +PKG_SOURCE:=python-dateutil-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=175b7c1a3cc0cb01151eced07c61c0b8 +PKG_BUILD_DIR:=$(BUILD_DIR)/python-dateutil-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=python3-setuptools + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Python powerful extensions to datetime + URL:=https://dateutil.readthedocs.io/en/stable/ + DEPENDS:=+python3 +python3-six +endef + +define Package/$(PKG_NAME)/description + Python powerful extensions to datetime +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,, \ + install --root="$(PKG_INSTALL_DIR)" --prefix="/usr" \ + --single-version-externally-managed \ + ) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-influxdb/Makefile b/python3-influxdb/Makefile index 7cdd0cb..56d61a3 100644 --- a/python3-influxdb/Makefile +++ b/python3-influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=Python client for InfluxDB - DEPENDS:=+python3 + DEPENDS:=+python3 +python3-requests +python3-pytz +python3-six +python3-dateutil endef define Build/Compile -- cgit v1.2.3 From 7957fff23ca027a9bae3ae5f66dc934cee815650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 15:15:05 +0200 Subject: python3-dateutil fix download path --- python3-dateutil/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-dateutil/Makefile b/python3-dateutil/Makefile index f1ad0d3..96a637e 100644 --- a/python3-dateutil/Makefile +++ b/python3-dateutil/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=python3-dateutil PKG_VERSION:=2.7.3 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://pypi.python.org/packages/source/r/python-dateutil/ +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/python-dateutil/ PKG_SOURCE:=python-dateutil-$(PKG_VERSION).tar.gz PKG_MD5SUM:=175b7c1a3cc0cb01151eced07c61c0b8 PKG_BUILD_DIR:=$(BUILD_DIR)/python-dateutil-$(PKG_VERSION) -- cgit v1.2.3 From 5cd5bed1c32e2d3cc92b91092c3a7a317e747b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 15:37:27 +0200 Subject: python3-requests: add missing dependencies --- python3-certifi/Makefile | 26 ++++++++++++++++++++++++++ python3-chardet/Makefile | 26 ++++++++++++++++++++++++++ python3-idna/Makefile | 26 ++++++++++++++++++++++++++ python3-requests/Makefile | 2 +- python3-urllib3/Makefile | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 python3-certifi/Makefile create mode 100644 python3-chardet/Makefile create mode 100644 python3-idna/Makefile create mode 100644 python3-urllib3/Makefile diff --git a/python3-certifi/Makefile b/python3-certifi/Makefile new file mode 100644 index 0000000..e51f02f --- /dev/null +++ b/python3-certifi/Makefile @@ -0,0 +1,26 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-certifi +PKG_VERSION:=2018.8.24 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/c/certifi/ +PKG_SOURCE:=certifi-$(PKG_VERSION).tar.gz +PKG_MDSUM:=c6be18cddd339c893131d992e13949c1 +PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/certifi-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Collection of Root Certificates for validating the trustworthiness of SSL certificates + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-chardet/Makefile b/python3-chardet/Makefile new file mode 100644 index 0000000..9a7fc6a --- /dev/null +++ b/python3-chardet/Makefile @@ -0,0 +1,26 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-chardet +PKG_VERSION:=3.0.4 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/c/chardet/ +PKG_SOURCE:=chardet-$(PKG_VERSION).tar.gz +PKG_MDSUM:=7dd1ba7f9c77e32351b0a0cfacf4055c +PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/charder-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=The Universal Character Encoding Detector + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-idna/Makefile b/python3-idna/Makefile new file mode 100644 index 0000000..7fc41ff --- /dev/null +++ b/python3-idna/Makefile @@ -0,0 +1,26 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-idna +PKG_VERSION:=2.7 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/i/idna/ +PKG_SOURCE:=chardet-$(PKG_VERSION).tar.gz +PKG_MDSUM:=0e5bb69018ddef1b9d95f681182be82c +PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/idna-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=Support for the Internationalised Domain Names in Applications + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/python3-requests/Makefile b/python3-requests/Makefile index bd43a33..c2d2b53 100644 --- a/python3-requests/Makefile +++ b/python3-requests/Makefile @@ -27,7 +27,7 @@ define Package/python3-requests CATEGORY:=Languages TITLE:=Python HTTP for Humans. URL:=http://python-requests.org - DEPENDS:=+python3 + DEPENDS:=+python3 +python3-charder +python3-idna +python3-urllib3 +python3-certifi endef define Package/python3-requests/description diff --git a/python3-urllib3/Makefile b/python3-urllib3/Makefile new file mode 100644 index 0000000..17057b0 --- /dev/null +++ b/python3-urllib3/Makefile @@ -0,0 +1,26 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-urllib3 +PKG_VERSION:=3.0.4 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/u/urllib3/ +PKG_SOURCE:=urllib3-$(PKG_VERSION).tar.gz +PKG_MDSUM:=1ad43e4b5ab7a0794c89dc057e1d7179 +PKG_MAINTAINER:=Karel Kočí +PKG_BUILD_DIR:=$(BUILD_DIR)/urllib3-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=A powerful, sanity-friendly HTTP client for Python + DEPENDS:=+python3 +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) -- cgit v1.2.3 From 9b2ea9c42a18fec9eb249df1b71c4661b068877b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 15:53:40 +0200 Subject: python3-idna: fix source name --- python3-idna/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-idna/Makefile b/python3-idna/Makefile index 7fc41ff..36e6e7f 100644 --- a/python3-idna/Makefile +++ b/python3-idna/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=2.7 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://pypi.python.org/packages/source/i/idna/ -PKG_SOURCE:=chardet-$(PKG_VERSION).tar.gz +PKG_SOURCE:=idna-$(PKG_VERSION).tar.gz PKG_MDSUM:=0e5bb69018ddef1b9d95f681182be82c PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/idna-$(PKG_VERSION) -- cgit v1.2.3 From 80fb71fe1f7ecb143a4cde74ebfb1ca3a5506af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 15:59:11 +0200 Subject: python3-urllib3: fix version --- python3-urllib3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-urllib3/Makefile b/python3-urllib3/Makefile index 17057b0..a322299 100644 --- a/python3-urllib3/Makefile +++ b/python3-urllib3/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-urllib3 -PKG_VERSION:=3.0.4 +PKG_VERSION:=1.23 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://pypi.python.org/packages/source/u/urllib3/ -- cgit v1.2.3 From bb201833867cb83ee3766d6b1a5ad2e804e1e0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 16:11:31 +0200 Subject: python3-chardet: fix build --- python3-chardet/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-chardet/Makefile b/python3-chardet/Makefile index 9a7fc6a..a629fb5 100644 --- a/python3-chardet/Makefile +++ b/python3-chardet/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_URL:=https://pypi.python.org/packages/source/c/chardet/ PKG_SOURCE:=chardet-$(PKG_VERSION).tar.gz PKG_MDSUM:=7dd1ba7f9c77e32351b0a0cfacf4055c PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/charder-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/chardet-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From b6e3cde6e911ae1a66b6681ab69498bd340ffaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 16:29:28 +0200 Subject: python3-reqiests: fix dependency --- python3-requests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-requests/Makefile b/python3-requests/Makefile index c2d2b53..e1aa5bf 100644 --- a/python3-requests/Makefile +++ b/python3-requests/Makefile @@ -27,7 +27,7 @@ define Package/python3-requests CATEGORY:=Languages TITLE:=Python HTTP for Humans. URL:=http://python-requests.org - DEPENDS:=+python3 +python3-charder +python3-idna +python3-urllib3 +python3-certifi + DEPENDS:=+python3 +python3-chardet +python3-idna +python3-urllib3 +python3-certifi endef define Package/python3-requests/description -- cgit v1.2.3 From a927a28b3ac837ade33929b95268d89a7979ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 17:05:35 +0200 Subject: bigclown-mqtt2influxdb: add configuration --- bigclown-mqtt2influxdb/Makefile | 9 ++++- bigclown-mqtt2influxdb/files/config.yml | 60 +++++++++++++++++++++++++++++++++ bigclown-mqtt2influxdb/files/init | 39 ++------------------- 3 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 bigclown-mqtt2influxdb/files/config.yml diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 0fe33dd..fd606f0 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-mqtt2influxdb -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git PKG_MAINTAINER:=Karel Kočí @@ -17,6 +17,13 @@ endef define Py3Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) ./files/mqtt2influxdb $(1)/usr/bin/mqtt2influxdb + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bc-mqtt2influxdb + $(INSTALL_DATA) ./files/config.yml $(1)/etc/bc-mqtt2influxdb.yml +endef + +define Package/$(PKG_NAME)/conffiles +/etc/bc-mqtt2influxdb.yml endef define Build/Compile diff --git a/bigclown-mqtt2influxdb/files/config.yml b/bigclown-mqtt2influxdb/files/config.yml new file mode 100644 index 0000000..922c1b9 --- /dev/null +++ b/bigclown-mqtt2influxdb/files/config.yml @@ -0,0 +1,60 @@ +mqtt: + host: 127.0.0.1 + port: 1883 + +influxdb: + host: 127.0.0.1 + port: 8086 + database: node + +points: + - measurement: temperature + topic: node/+/thermometer/+/temperature + fields: + value: $.payload + tags: + id: $.topic[1] + channel: $.topic[3] + + - measurement: relative-humidity + topic: node/+/hygrometer/0:4/relative-humidity + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: illuminance + topic: node/+/lux-meter/0:0/illuminance + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: pressure + topic: node/+/barometer/0:0/pressure + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: co2 + topic: node/+/co2-meter/-/concentration + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: voltage + topic: node/+/battery/+/voltage + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: button + topic: node/+/push-button/+/event-count + fields: + value: $.payload + tags: + id: $.topic[1] + channel: $.topic[3] diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init index f9efc0e..76e5d2d 100644 --- a/bigclown-mqtt2influxdb/files/init +++ b/bigclown-mqtt2influxdb/files/init @@ -6,41 +6,12 @@ STOP=1 USE_PROCD=1 PROG=/usr/bin/mqtt2influxdb -CONF=/tmp/etc/bc-mqtt2influxdb.conf - -append() { - local cfg="$1" - local uci_name="$2" - local out_name="$3" - local default="$4" - config_get val $cfg $uci_name $default - if [ -n "$val" ]; then - echo "$out_name $val" >> $CONF - fi -} +CONF=/etc/bc-mqtt2influxdb.yml start_service() { - config_load bc-gateway-usb-dongle - - rm -rf $CONF - echo "Generating bc-gateway-usb-dongle config file in $CONF" - - append gateway name 'name:' usb-dongle - append gateway device 'device:' /dev/ttyUSB0 - append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 - append gateway base_topic_prefix 'base_topic_prefix:' - - echo "mqtt:" >> $CONF - - append mqtt host ' host:' localhost - append mqtt port ' port:' 1883 - append mqtt cafile ' cafile:' - append mqtt certfile ' certfile:' - append mqtt keyfile ' keyfile:' - procd_open_instance procd_set_param respawn - procd_set_param command "$PROG" -c "$CONF" --debug + procd_set_param command "$PROG" -c "$CONF" procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance @@ -48,10 +19,4 @@ start_service() { stop_service() { service_stop "$PROG" - ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 -} - -service_triggers() -{ - procd_add_reload_trigger 'bc-gateway-usb-dongle' } -- cgit v1.2.3 From 90a56b0f739de9d49e4f2470d5326508e69c85c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 17:05:54 +0200 Subject: bigclown-gateway: change default configuration --- bigclown-gateway/files/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bigclown-gateway/files/config b/bigclown-gateway/files/config index 7fa3977..c16e31b 100644 --- a/bigclown-gateway/files/config +++ b/bigclown-gateway/files/config @@ -1,9 +1,9 @@ -config config 'gateway' +config gateway 'gateway' option name 'usb-dongle' option device '/dev/ttyUSB0' option automatic_rename_kit_nodes '1' -config config 'mqtt' +config mqtt 'mqtt' option host 'localhost' option port '1883' -- cgit v1.2.3 From d3997b58d70027875704feefe55c5926308af9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 14 Sep 2018 13:29:07 +0200 Subject: Add some additional dependencies --- bigclown-control-tools/Makefile | 2 +- bigclown-gateway/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bigclown-control-tools/Makefile b/bigclown-control-tools/Makefile index cf5fffc..12f5495 100644 --- a/bigclown-control-tools/Makefile +++ b/bigclown-control-tools/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown control tools - DEPENDS:=+python3 +click-log +python3-influxdb + DEPENDS:=+python3 +click-log +python3-influxdb +python3-pyyaml +python3-pyserial +python3-simplejson endef define Py3Package/$(PKG_NAME)/install diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index df17fd6..03b25b1 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown gateway - DEPENDS:=+python3 +mosquitto +mosquitto-client +kmod-usb-serial-ftdi +kmod-usb-acm + DEPENDS:=+python3 +mosquitto +mosquitto-client +kmod-usb-serial-ftdi +kmod-usb-acm +python3-paho-mqtt +python3-pyyaml +python3-pyserial +python3-simplejson endef define Py3Package/$(PKG_NAME)/install -- cgit v1.2.3 From 518bc00ef4c6784dd854bd1cc0adff47ee087b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 16 Sep 2018 19:36:06 +0200 Subject: pkgauto: Try to fix which tag is marked as latest --- autopkg-tag.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autopkg-tag.mk b/autopkg-tag.mk index 11adc22..acfd944 100644 --- a/autopkg-tag.mk +++ b/autopkg-tag.mk @@ -2,7 +2,7 @@ AUTOPKG_VARIANT:=tag include $(TOPDIR)/package/autopkg-head.mk -PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort | tail -1) +PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort -n | tail -1) PKG_VERSION:=$(subst v%,%,$(PKG_SOURCE_VERSION)) include $(TOPDIR)/package/autopkg-tail.mk -- cgit v1.2.3 From 42c93d97df6721fb90fc7b61e693332ee01e8f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 16 Sep 2018 21:06:47 +0200 Subject: autopkg: fix for real --- autopkg-tag.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autopkg-tag.mk b/autopkg-tag.mk index acfd944..140c1c6 100644 --- a/autopkg-tag.mk +++ b/autopkg-tag.mk @@ -2,7 +2,7 @@ AUTOPKG_VARIANT:=tag include $(TOPDIR)/package/autopkg-head.mk -PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort -n | tail -1) +PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort -V | tail -1) PKG_VERSION:=$(subst v%,%,$(PKG_SOURCE_VERSION)) include $(TOPDIR)/package/autopkg-tail.mk -- cgit v1.2.3 From aaf23c38eaaa9064b4bf4ad08e4566ea3680b096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 16 Sep 2018 22:45:45 +0200 Subject: Add update version of pyserial --- python3-pyserial/Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 python3-pyserial/Makefile diff --git a/python3-pyserial/Makefile b/python3-pyserial/Makefile new file mode 100644 index 0000000..2ccd867 --- /dev/null +++ b/python3-pyserial/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python3-pyserial +PKG_VERSION:=3.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=pyserial-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pyserial/ +PKG_MD5SUM:=ed6183b15519a0ae96675e9c3330c69b + +PKG_BUILD_DIR:=$(BUILD_DIR)/pyserial-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/python3-pyserial + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Python Serial Port Extension + URL:=http://pyserial.sourceforge.net/ + DEPENDS:=+python3 +endef + +define Package/python3-pyserial/description + Python Serial Port Extension +endef + +define Build/Compile + $(call Build/Compile/Py3Mod,, \ + install --root="$(PKG_INSTALL_DIR)" --prefix="/usr" \ + ) +endef + +$(eval $(call Py3Package,python3-pyserial)) +$(eval $(call BuildPackage,python3-pyserial)) -- cgit v1.2.3 From 60fa656371b79eb796c3df7bba53c547d5e17557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 17 Sep 2018 10:16:50 +0200 Subject: In some of the Python3 packages use pypi instead of github --- python3-dateutil/Makefile | 7 ------- python3-influxdb/Makefile | 6 +++++- python3-jsonpath-ng/Makefile | 10 +++++----- python3-pyserial/Makefile | 7 ------- python3-requests/Makefile | 7 ------- python3-six/Makefile | 7 ------- 6 files changed, 10 insertions(+), 34 deletions(-) diff --git a/python3-dateutil/Makefile b/python3-dateutil/Makefile index 96a637e..357590f 100644 --- a/python3-dateutil/Makefile +++ b/python3-dateutil/Makefile @@ -1,10 +1,3 @@ -# -# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - include $(TOPDIR)/rules.mk PKG_NAME:=python3-dateutil diff --git a/python3-influxdb/Makefile b/python3-influxdb/Makefile index 56d61a3..6f360e3 100644 --- a/python3-influxdb/Makefile +++ b/python3-influxdb/Makefile @@ -1,8 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-influxdb +PKG_VERSION:=5.2.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/influxdata/influxdb-python.git + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/i/influxdb/ +PKG_SOURCE:=influxdb-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=8d82a3e48c8d20f4d1f1243c6bb04402 PKG_MAINTAINER:=Karel Kočí include $(TOPDIR)/package/autopkg-tag.mk diff --git a/python3-jsonpath-ng/Makefile b/python3-jsonpath-ng/Makefile index 78bc42a..2c55565 100644 --- a/python3-jsonpath-ng/Makefile +++ b/python3-jsonpath-ng/Makefile @@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-jsonpath-ng PKG_VERSION:=1.4.3 -PKG_GIT_VERSION:=003a0b78f8a1857aa7027a837def54564a2b578a PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/h2non/jsonpath-ng/archive/$(PKG_GIT_VERSION)/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MDSUM:=bcc11792f1877b60ad267b7eb3c1e3b6 + +PKG_SOURCE_URL:=https://pypi.python.org/packages/source/j/jsonpath-ng/ +PKG_SOURCE:=jsonpath-ng-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=cb507b93e1e9b81c6f2e01061eeb2098 +PKG_BUILD_DIR:=$(BUILD_DIR)/jsonpath-ng-$(PKG_VERSION) PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/jsonpath-ng-$(PKG_GIT_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) diff --git a/python3-pyserial/Makefile b/python3-pyserial/Makefile index 2ccd867..d1d8aaf 100644 --- a/python3-pyserial/Makefile +++ b/python3-pyserial/Makefile @@ -1,10 +1,3 @@ -# -# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - include $(TOPDIR)/rules.mk PKG_NAME:=python3-pyserial diff --git a/python3-requests/Makefile b/python3-requests/Makefile index e1aa5bf..f7a97ee 100644 --- a/python3-requests/Makefile +++ b/python3-requests/Makefile @@ -1,10 +1,3 @@ -# -# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - include $(TOPDIR)/rules.mk PKG_NAME:=python3-requests diff --git a/python3-six/Makefile b/python3-six/Makefile index dfa662d..1aa2938 100644 --- a/python3-six/Makefile +++ b/python3-six/Makefile @@ -1,10 +1,3 @@ -# -# Copyright (C) 2015 CZ.NIC, z. s. p. o. (https://www.nic.cz/) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - include $(TOPDIR)/rules.mk PKG_NAME:=python3-six -- cgit v1.2.3 From d4c7a539fab1c7f9d27f25a15f0e57a95eba25eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 18 Sep 2018 13:32:19 +0200 Subject: python3-influxdb: drop autopkg-tag include --- python3-influxdb/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/python3-influxdb/Makefile b/python3-influxdb/Makefile index 6f360e3..49b8fba 100644 --- a/python3-influxdb/Makefile +++ b/python3-influxdb/Makefile @@ -9,7 +9,6 @@ PKG_SOURCE:=influxdb-$(PKG_VERSION).tar.gz PKG_MD5SUM:=8d82a3e48c8d20f4d1f1243c6bb04402 PKG_MAINTAINER:=Karel Kočí -include $(TOPDIR)/package/autopkg-tag.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python3-package.mk) -- cgit v1.2.3 From 3aeaf5413bf2c23612c23a751dabc7c3c378c53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 18 Sep 2018 15:09:56 +0200 Subject: python3-influxdb: Fix build --- python3-influxdb/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/python3-influxdb/Makefile b/python3-influxdb/Makefile index 49b8fba..b97c5c2 100644 --- a/python3-influxdb/Makefile +++ b/python3-influxdb/Makefile @@ -7,6 +7,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=https://pypi.python.org/packages/source/i/influxdb/ PKG_SOURCE:=influxdb-$(PKG_VERSION).tar.gz PKG_MD5SUM:=8d82a3e48c8d20f4d1f1243c6bb04402 +PKG_BUILD_DIR:=$(BUILD_DIR)/influxdb-$(PKG_VERSION) PKG_MAINTAINER:=Karel Kočí include $(INCLUDE_DIR)/package.mk -- cgit v1.2.3 From c232e31116a1f743f0caa2a93678cb1abe198d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 26 Sep 2018 10:12:01 +0200 Subject: Add dependencies to personal-pkgs-repo --- personal-pkgs-repo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index f4f5e18..81a539a 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1 +PKG_VERSION:=1.1 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - TITLE:=Package with repository key + TITLE:=Package with repository key and meta dependencies + DEPENDS:=+shellrc-zsh +shellrc-ash endef define Build/Compile -- cgit v1.2.3 From c3e94cf7d03f4876e133c2a04ad4d490402f435e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 27 Sep 2018 11:13:09 +0200 Subject: personal-pkgs-repo: Add opkg feed hack and little cleanup --- personal-pkgs-repo/Makefile | 21 +++++++++++++++++++-- personal-pkgs-repo/files/updater.lua | 17 ++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index 81a539a..3b150e4 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1.1 +PKG_VERSION:=1.2 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) TITLE:=Package with repository key and meta dependencies - DEPENDS:=+shellrc-zsh +shellrc-ash endef define Build/Compile @@ -33,4 +32,22 @@ define Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/personal-pkgs.lua endef +BOARD=turris +ifeq ($(CONFIG_TARGET_mvebu_Turris-Omnia),y) +BOARD=omnia +endif + +define Package/$(PKG_NAME)/postinst +#!/bin/sh +feedsfile="$$IPKG_INSTROOT/etc/opkg/customfeeds.conf" +sed -i '/^src\/gz personal/d' "$$feedsfile" +echo "src/gz personal https://cynerd.cz/repo/turris3x/$(BOARD)" >> "$$feedsfile" +endef + +define Package/$(PKG_NAME)/prerm +#!/bin/sh +feedsfile="$$IPKG_INSTROOT/etc/opkg/customfeeds.conf" +sed -i '/^src\/gz personal/d' "$$feedsfile" +endef + $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/personal-pkgs-repo/files/updater.lua b/personal-pkgs-repo/files/updater.lua index 9c29984..2bf7636 100644 --- a/personal-pkgs-repo/files/updater.lua +++ b/personal-pkgs-repo/files/updater.lua @@ -7,17 +7,12 @@ else DIE("Unsupported board!") end -if version_match(turris_version, '<4.0') then - Repository("personal-pkgs", "https://cynerd.cz/repo/turris3x/" .. board, { - pubkey = "file:///etc/updater/keys/personal-pkgs.pub", - ocsp = false - }) -else - Repository("personal-pkgs", "https://cynerd.cz/repo/openwrt/" .. board, { - pubkey = "file:///etc/updater/keys/personal-pkgs.pub", - ocsp = false - }) -end +Repository("personal-pkgs", "https://cynerd.cz/repo/turris3x/" .. board, { + pubkey = "file:///etc/updater/keys/personal-pkgs.pub", + ocsp = false +}) Install("personal-pkgs-repo") Package("personal-pkgs-repo", { replan = "finished" }) + +Install("shellrc-zsh", "shellrc-ash") -- cgit v1.2.3 From 3fe1aa96acf4eefb8769d25a0aaa0a5a65be8ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 27 Sep 2018 15:08:49 +0200 Subject: updater-ng: for now use opkg-wrapper-ignore branch instead of master --- updater-ng/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/updater-ng/Makefile b/updater-ng/Makefile index 257ed8c..d243904 100644 --- a/updater-ng/Makefile +++ b/updater-ng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=updater-ng PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_BRANCH:=master +PKG_SOURCE_BRANCH:=opkg-wrapper-ignore PKG_MAINTAINER:=CZ.NIC HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host PKG_BUILD_DEPENDS:=busybox @@ -166,6 +166,8 @@ define Package/$(PKG_NAME)-opkg/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/localrepo/content2localrepo $(1)/usr/share/updater/opkg-content2localrepo.sh $(INSTALL_DIR) $(1)/etc/updater/conf.d $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/opkg-wrapper/opkg.lua $(1)/etc/updater/conf.d/opkg.lua + $(INSTALL_DIR) $(1)/etc/updater/opkg-ignore + touch $(1)/etc/updater/opkg-ignore/.keep endef # We are calling migration to localrepo from updater-ng-opkg package posinst as -- cgit v1.2.3 From 27ea9124b86704dda7cd5d386dd9bbbbee9d9a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 27 Sep 2018 15:27:22 +0200 Subject: personal-pkgs-repo: add opkg-wrapper ignore for this repository --- personal-pkgs-repo/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index 3b150e4..2c28564 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1.2 +PKG_VERSION:=1.3 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -30,6 +30,9 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/updater/conf.d $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/personal-pkgs.lua + + $(INSTALL_DIR) $(1)/etc/updater/opkg-ignore + echo ' personal ' >$(1)/etc/updater/opkg-ignore/personal-pkgs endef BOARD=turris -- cgit v1.2.3 From e48d2180906f69009fc830b5a1f5696c6e6ab88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 30 Sep 2018 08:02:09 +0200 Subject: bigclown: configure init script respawn --- bigclown-gateway/Makefile | 2 +- bigclown-gateway/files/init | 2 +- bigclown-mqtt2influxdb/Makefile | 2 +- bigclown-mqtt2influxdb/files/init | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigclown-gateway/Makefile b/bigclown-gateway/Makefile index 03b25b1..031c315 100644 --- a/bigclown-gateway/Makefile +++ b/bigclown-gateway/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-gateway.git PKG_MAINTAINER:=Karel Kočí diff --git a/bigclown-gateway/files/init b/bigclown-gateway/files/init index 090cc06..02f27d1 100755 --- a/bigclown-gateway/files/init +++ b/bigclown-gateway/files/init @@ -39,7 +39,7 @@ start_service() { append mqtt keyfile ' keyfile:' procd_open_instance - procd_set_param respawn + procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} procd_set_param command "$PROG" -c "$CONF" -W procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index fd606f0..c77bbbe 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-mqtt2influxdb -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git PKG_MAINTAINER:=Karel Kočí diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init index 76e5d2d..5218205 100644 --- a/bigclown-mqtt2influxdb/files/init +++ b/bigclown-mqtt2influxdb/files/init @@ -10,7 +10,7 @@ CONF=/etc/bc-mqtt2influxdb.yml start_service() { procd_open_instance - procd_set_param respawn + procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} procd_set_param command "$PROG" -c "$CONF" procd_set_param stdout 1 procd_set_param stderr 1 -- cgit v1.2.3 From d32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 9 Oct 2018 09:46:50 +0200 Subject: Revert "updater-ng: for now use opkg-wrapper-ignore branch instead of master" This reverts commit 3fe1aa96acf4eefb8769d25a0aaa0a5a65be8ea7. --- updater-ng/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/updater-ng/Makefile b/updater-ng/Makefile index d243904..257ed8c 100644 --- a/updater-ng/Makefile +++ b/updater-ng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=updater-ng PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_BRANCH:=opkg-wrapper-ignore +PKG_SOURCE_BRANCH:=master PKG_MAINTAINER:=CZ.NIC HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host PKG_BUILD_DEPENDS:=busybox @@ -166,8 +166,6 @@ define Package/$(PKG_NAME)-opkg/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/localrepo/content2localrepo $(1)/usr/share/updater/opkg-content2localrepo.sh $(INSTALL_DIR) $(1)/etc/updater/conf.d $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/opkg-wrapper/opkg.lua $(1)/etc/updater/conf.d/opkg.lua - $(INSTALL_DIR) $(1)/etc/updater/opkg-ignore - touch $(1)/etc/updater/opkg-ignore/.keep endef # We are calling migration to localrepo from updater-ng-opkg package posinst as -- cgit v1.2.3