Upstream has merged a simplified version of the FHS patch, with a few
changes...
Scripts are actually configuration. There are examples, but the point is
that you write your own.
So they should live in the data directory (e.g. /var/lib/domoticz) not
in /usr/share/domoticz. The only exception is the dzVents runtime.
So.... the upstream patch handles the dzVents runtime bit. Drop the part
of our patch which added -scripts, because it can just be based in the
userdata directory and we don't need to change that.
Ship the default scripts/ directory in /etc/domoticz/scripts, and on
startup make a *symlink* to it from /var/lib/domoticz/scripts.
Symlink from /etc/domoticz/scripts/dzVents{data,generated_scripts} to
temporary directories under /var/lib/domoticz/dzVents so that those
directories (which are written to by Domoticz) don't land on the root
file system. Anyone with a writeable file system who *wants* the data/
directory to be persistent, can change that. Just as they can change
the userdata config option to point to a real file system somewhere.
Also drop the renaming of the OpenZWave Config/ directory. It's purely
cosmetric so there's no need for us to carry that change. It can go
upstream first, if it really offends anyone.
Drop the patches which are now merged upstream, and turn off the newly
added USE_OPENSSL_STATIC. Add -noupdates to the command line.
Finally, gzip the static www files to save space. In the common case,
clients will use "Accept-Encodiong: gzip" and Domoticz will serve them
as-is. It can also decompress on the fly if it really has to, but now we
aren't asking it to *compress* on the fly, which is probably a losing
proposition on an OpenWRT box.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This makes quite a significant difference to the executable size:
text data bss dec hex filename
7921421 87804 31692 8040917 7ab1d5 domoticz
5862321 86180 31212 5979713 5b3e41 domoticz-lto
As an added bonus, it still seems to work.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
nano 2.9.7 was released on 2018 May 15.
Release notes:
GNU nano 2.9.7 "Hvide Sande" adds the option '--afterends'
for making Ctrl+Right (the nextword function) stop at word
ends instead of beginnings, accepts multibyte letters for
the Yes/No/All answers, does emergency saves of changed
buffers in the unlikely event that nano crashes, adds the
until-now missing bindable function 'linenumbers', and
renames the toggles 'constupdate' to 'constantshow' and
'cuttoend' to 'cutfromcursor', for consistency with the
corresponding options -- adjust your nanorc files soon.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Update to flashrom version 1.0 and cherry-pick an upstream fix for deprecated
libusb api usage.
Fixes the following error spotted by the buildbots:
ch341a_spi.c: In function 'ch341a_spi_init':
ch341a_spi.c:447:2: error: 'libusb_set_debug' is deprecated: [...]
libusb_set_debug(NULL, 3); // Enable information, warning and [...]
^~~~~~~~~~~~~~~~
In file included from ch341a_spi.c:25:0:
.../libusb-1.0/libusb.h:1300:18: note: declared here
void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Makefile:1030: recipe for target 'ch341a_spi.o' failed
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
As suggested by Daniel Engberg, add some mirror servers to offload from
MariaDB's main download server.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
- create directory /etc/mysql/conf.d as without it the server refuses to
start
- correct the path to my.cnf in the init script
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
The second source is just a redirect to SourceForge. Removed.
Also change URL to HTTPS as the website now supports it.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Hannu mentioned that --recursive could not be available always. That is
correct. While GNU coreutils' ln supports this, BSD's ln for example does
not.
This commit addresses that.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Historically programs added /usr/lib/mysql to the library search path when
linking. mariadb does not do so anymore, although even its mysql_config
script suggests to use this path. When an old version of the library still
resides in this directory (like from an old mysql installation) it will be
linked against instead of the current library which is in /usr/lib.
To prevent this simply install symlinks from the staging libs in /usr/lib
into /usr/lib/mysql. This fixes build failures on the build bots which are
seen with libzdb and libdbi-drivers.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
adds openwrt specific information about the device.
include DISTRIB_{ID, RELEASE, REVISION}, board_name and model
Example output:
# TYPE node_openwrt_info gauge
node_openwrt_info{revision="55a0636",model="QEMU Standard PC (i440FX + PIIX, 1996)",id="LiMe",board_name="qemu-standard-pc-i440fx-piix-1996",release="snapshot"} 1
node_scrape_collector_duration_seconds{collector="openwrt"} 3.814697265625e-05
node_scrape_collector_success{collector="openwrt"} 1
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Nano 2.9.6 release notes:
GNU nano 2.9.6 "Gomance" fixes a crash in word completion,
makes --enable-altrcname work again, improves the fluidity
of scrolling when using the touchpad, tweaks the syntaxes
for shell scripts and PO files, makes a replacing session
go always forward by default, no longer inserts a newline
after an external spell check of a selected region, always
accepts the English Y and N (and A) at a yes-no prompt in
any locale, and solves a few hypothetical bugs.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
mysql was replaced by mariadb. The lazy dependency
"+PACKAGE_libmysqlclient:libmysqlclient" does not work anymore as
"PACKAGE_libmysqlclient" no longer exists. This results in:
Package gammu is missing dependencies for the following libraries:
libmysqlclient.so.18
This commit addresses that.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Print all files from /var/prometheus/*.prom. This behaviour allow users
to add metrics with non-lua scripts.
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Observed once in about two dozen builds on the bots:
make[6]: *** No rule to make target '/build/lede-snapshots/arm_cortex-a7_neon-vfpv4/build/sdk/staging_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/usr/lib/libevent.so', needed by 'tests/async_queries'. Stop.
Address this by adding libevent2 to PKG_BUILD_DEPENDS.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
MariaDB is a drop-in replacement for MySQL. This commit adds a current
and stable version of MariaDB to the tree.
Quite a few ideas/patches were copied from Alpine Linux, Busybox Buildroot
and Debian.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
If bmx7 isn't running just yet the folder
`/var/run/bmx7/json/originators` is missing and so the while loop runs
non stop. Now the loop sleeps for 10 seconds if inotifywait fails.
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Makes it easy to address bmx7 shorids and hostnames with ping, ssh, etc.
Both are stored in /tmp/hosts/ and so loaded by dnsmasq.
Instead of using a cron job which triggers the bmx7 deamon every so and
so, inotifywait is used to see creation or deletion of originators in
/var/run/bmx7/json/originators/
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Now monitors as well the tunIn parameters, aka the annoucend routes to
the network. This is handy to check if a node annouces itself as a
gateway.
Also list all activated plugins.
Example output:
# TYPE bmx7_tunIn gauge
bmx7_tunIn{name="myIP4",network="10.198.52.86/32"} 1
bmx7_tunIn{name="myIP6",network="2012:0:0:56::/128"} 1
bmx7_tunIn{name="inet4",network="0.0.0.0/0"} 1
# TYPE bmx7_plugin gauge
bmx7_plugin{name="bmx7_config.so"} 1
bmx7_plugin{name="bmx7_json.so"} 1
bmx7_plugin{name="bmx7_sms.so"} 1
bmx7_plugin{name="bmx7_tun.so"} 1
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Patch 903-no-examples.patch removes MinOZW binary. This is wrong since
install section of openzwave is still using it. We can either remove the
patch or remove install section for openzwave. It seems people are using
this binary so we remove the patch.
After removing the patch the following issue appears with gcc7:
cc1plus: error: -Wformat-security ignored without -Wformat
This is resolved by adding the following to Makefile
TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
David Woodhouse
Rosen Penev
Hannu Nyman
Jo-Philipp Wich
Sebastian Kemper
BERENYI, Balazs
Yousong Zhou
Daniel Engberg
Takashi Umeno
Reiner Herrmann
Paul Spooren
Vladimir Ulrich
Sebastian Muszynski
Philip Prindeville
Shuanglei Tao
Hirokazu MORIKAWA
Michael Heimpold
Maxim Storchak
Daniel Golle
Marko Ratkaj