diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2016-02-11 01:50:45 +0100 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-02-11 01:51:02 +0100 |
commit | 44466a3194ce7a4571327a7ba5b0ce8594f427b3 (patch) | |
tree | 69e21a830c65d7ff706062e5f78627f6cb5d0183 | |
parent | b344fde7397cab847e31e9eb25b1d71158a6f800 (diff) | |
download | aports-44466a3194ce7a4571327a7ba5b0ce8594f427b3.tar.bz2 aports-44466a3194ce7a4571327a7ba5b0ce8594f427b3.tar.xz |
testing/domoticz: multiple fixes
-rw-r--r-- | testing/domoticz/APKBUILD | 23 | ||||
-rw-r--r-- | testing/domoticz/domoticz.confd | 1 | ||||
-rw-r--r-- | testing/domoticz/domoticz.initd | 2 | ||||
-rw-r--r-- | testing/domoticz/domoticz.pre-install | 2 | ||||
-rw-r--r-- | testing/domoticz/use-datapath-for-zwave-config.patch | 21 |
5 files changed, 37 insertions, 12 deletions
diff --git a/testing/domoticz/APKBUILD b/testing/domoticz/APKBUILD index a8ea06c9ea..39c097525c 100644 --- a/testing/domoticz/APKBUILD +++ b/testing/domoticz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=domoticz pkgver=20160207 -pkgrel=1 +pkgrel=2 pkgdesc="Open source Home Automation System" url="http://www.domoticz.com/" arch="all" @@ -12,12 +12,12 @@ depends_dev="" pkgusers="$pkgname" pkggroups="$pkgname" makedepends="cmake $depends_dev openssl-dev zlib-dev curl-dev boost-dev - sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev - openzwave-dev" + sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev openzwave-dev" install="$pkgname.pre-install" subpackages="" source="http://dev.alpinelinux.org/archive/domoticz/domoticz-$pkgver.tar.gz 3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch + use-datapath-for-zwave-config.patch $pkgname.initd $pkgname.confd " @@ -55,7 +55,7 @@ package() { make DESTDIR="$pkgdir" install || return 1 mkdir -p "$pkgdir"/usr/bin mv "$pkgdir"/var/lib/domoticz/domoticz \ - "$pkgdir"/usr/bin/ || return 1 + "$pkgdir"/usr/bin/ || return 1 rm -f "$pkgdir"/var/lib/domoticz/updatedomo chown -R $pkgname "$pkgdir"/var/lib/domoticz || return 1 install -D -m755 "$srcdir"/$pkgname.initd \ @@ -65,13 +65,16 @@ package() { } md5sums="1092ea41a91d82f321b372e3b390c09c domoticz-20160207.tar.gz 39295664197b86b9b67cce90220f8c10 3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch -559725b8354c850c8a29f0083cc208f7 domoticz.initd -6771e150da2c75c824a95ce761d8a739 domoticz.confd" +018a8d1d100468a8de19e95e3d7d8bc5 use-datapath-for-zwave-config.patch +ddb53f4567fc49e8ed14c4635a2b8953 domoticz.initd +402419170716afe854d659f7b5c93ac4 domoticz.confd" sha256sums="33419077e8f45ab30084867d09271db359fb57cdc54dce8fafa09a2e2327bdec domoticz-20160207.tar.gz be6748531de484d5a40da4abde4989216b4d91a06b03639faa2943efcf71a8c0 3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch -082a6b656ef530603137f03a67101ca3a676c362ed3a84f9a138d6113cb4f13c domoticz.initd -285013a126eb98ab78eaef3cce26b42361916418f6b6271233c0c878e69ee0f3 domoticz.confd" +27b65e0748fce9a20e2908833b9963adc2693603fe25ce6c0e25dc70975f536b use-datapath-for-zwave-config.patch +f096951e74715e11a399ce6be1445bd5da07656f5a956585b1098959d79d5d3c domoticz.initd +ef891933bef1c9a710279dd3d8ca6e912dd37c03fc3b1b6a23d9d1eb3a1f8d2f domoticz.confd" sha512sums="19ea7391004c109199f913a6b08d8b4ad03c0e3f0405047e52d9c178735f309ae9e25748f0c297e4f777353e6cd78309049811b93a743390256f10abc27833a0 domoticz-20160207.tar.gz 2d8ccffc508d9ee7360bd718187a3c9c1eee1356d415f8258259e52640e249dc5af5998c9c4d26e9d8fdf27b61e5b14607fbb55e1c531619a5df91a6d80b5e86 3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch -337c1999675620532b0763ea9c9d630baf344c8b8a40afe7e487e8e07383fb6ecd10307c310c42894fd95f5d20c573484b5318356e52980e0e05026472295e3e domoticz.initd -f8026d0fc151e3d1a66946057b8b506a2210606602c55d34392c7d4cb3bd352735c2c402e565ecb79ac308bfea18111d61e05da06caf2982ed871749dbfb9f69 domoticz.confd" +52e2cc45b7a49276d24997eb4b0a1de6384d0ee4c533d76c2d266dea28318de9ef106be9b6d52ed165b1331583e1b664c7fd9f157c16770a8a32fa7872d40ff0 use-datapath-for-zwave-config.patch +272f6353a51a44ecd5997f73fbb8866a2ffad81f69d2fabaf144aa1cf639a536be97856b046c785203811926352e71a11975642b6069713477237a5f0afd5de7 domoticz.initd +ec082654ed13858b87368dd47b54929d6dc0e0c331715da794fa08c8b371be6ff5603afa024883c76a70b4dd127a7374e60aaf6e4d12bfb60fa7f5e08d52e40f domoticz.confd" diff --git a/testing/domoticz/domoticz.confd b/testing/domoticz/domoticz.confd index 14b6cca922..ab3c49757a 100644 --- a/testing/domoticz/domoticz.confd +++ b/testing/domoticz/domoticz.confd @@ -4,3 +4,4 @@ dbase="/var/lib/domoticz/domoticz.db" userdata="/var/lib/domoticz/" wwwroot="/var/lib/domoticz/www/" pidfile="/var/run/domoticz/domoticz.pid" +daemon_args="" diff --git a/testing/domoticz/domoticz.initd b/testing/domoticz/domoticz.initd index 07e852b35e..f8286f0740 100644 --- a/testing/domoticz/domoticz.initd +++ b/testing/domoticz/domoticz.initd @@ -2,7 +2,7 @@ name=domoticz command=/usr/bin/$name -command_args="-dbase $dbase -userdata $userdata -wwwroot $wwwroot -pidfile $pidfile -syslog -daemon" +command_args="-dbase $dbase -userdata $userdata -wwwroot $wwwroot -pidfile $pidfile -syslog -daemon $daemon_args" command_background=YES start_stop_daemon_args="--user $user" diff --git a/testing/domoticz/domoticz.pre-install b/testing/domoticz/domoticz.pre-install index b8bfba4a96..78026bfedb 100644 --- a/testing/domoticz/domoticz.pre-install +++ b/testing/domoticz/domoticz.pre-install @@ -1,4 +1,4 @@ #!/bin/sh adduser -H -D -s /sbin/nologin domoticz 2>/dev/null -adduser domoticz usb +adduser domoticz usb 2>/dev/null exit 0 diff --git a/testing/domoticz/use-datapath-for-zwave-config.patch b/testing/domoticz/use-datapath-for-zwave-config.patch new file mode 100644 index 0000000000..9a7f498223 --- /dev/null +++ b/testing/domoticz/use-datapath-for-zwave-config.patch @@ -0,0 +1,21 @@ +diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp +index 6bb88d1..9a77005 100644 +--- a/hardware/OpenZWave.cpp ++++ b/hardware/OpenZWave.cpp +@@ -955,13 +955,15 @@ bool COpenZWave::OpenSerialConnector() + std::string UserPath = ConfigPath;
+ if (szStartupFolder != szUserDataFolder)
+ {
+- UserPath = szUserDataFolder;
++ ConfigPath = szUserDataFolder + "Config/";
++ UserPath = ConfigPath;
+ }
+ // Create the OpenZWave Manager.
+ // The first argument is the path to the config files (where the manufacturer_specific.xml file is located
+ // The second argument is the path for saved Z-Wave network state and the log file. If you leave it NULL
+ // the log file will appear in the program's working directory.
+ _log.Log(LOG_STATUS, "OpenZWave: using config in: %s", ConfigPath.c_str());
++ _log.Log(LOG_STATUS, "OpenZWave: writing config in: %s", UserPath.c_str());
+ OpenZWave::Options::Create(ConfigPath, UserPath, "--SaveConfiguration=true ");
+ EnableDisableDebug();
+ OpenZWave::Options::Get()->AddOptionInt("PollInterval", 60000); //enable polling each 60 seconds
|