crelay: Update to 0.10, refresh patches, remove daemon background call

Signed-off-by: Ted Hess <thess@kitschensync.net>

diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile
index 6445f8d8cc1ddfbc7344e2adddfcecb0e3b1a7ea..26c7afee9a5e59e6965d0f88731266219b8bc2f9 100644 (file)
--- a/utils/crelay/Makefile
+++ b/utils/crelay/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015 OpenWrt.org
+# Copyright (C) 2015-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crelay
-PKG_VERSION:=0.9
+PKG_VERSION:=0.10
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -40,7 +40,8 @@ define Package/crelay/description
  .
  Currently supported relay cards:
       - Conrad USB 4-channel relay card
-      - Sainsmart USB 4-channel relay card
+      - Sainsmart USB 4/8-channel relay board
+      - Sainsmart USB 16-channel relay control module
       - Generic GPIO relays
       - HID API compatible relay card
 endef

diff --git a/utils/crelay/files/crelay.init b/utils/crelay/files/crelay.init
index e00396118e7644bcab6a1a5e2d1c89e8399d0bbf..53183a8cfe84d712ec60f384b6ed6673d93ae762 100644 (file)
--- a/utils/crelay/files/crelay.init
+++ b/utils/crelay/files/crelay.init
@@ -13,6 +13,9 @@ USE_PROCD=1
 start_service() {
        procd_open_instance
 
+       # restart if it croaks
+       procd_set_param respawn
+
        procd_set_param command "$PROG"
        # daemon mode (not daemonized) - starts HTTP server
        procd_append_param command -d

diff --git a/utils/crelay/patches/010-link_with_ftdi1.patch b/utils/crelay/patches/010-link_with_ftdi1.patch
index bc4ff1ed32fd758e802afb7b731d3843de7a24db..26b4c97711385a6dd14f00508cb0013313450536 100644 (file)
--- a/utils/crelay/patches/010-link_with_ftdi1.patch
+++ b/utils/crelay/patches/010-link_with_ftdi1.patch
@@ -1,11 +1,11 @@
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -45,7 +45,7 @@ endif
- #ifdef DRV_SAINSMART
+@@ -44,7 +44,7 @@ OPTS += -DDRV_CONRAD
+ endif
  ifeq ($(DRV_SAINSMART), y)
  SRC   += relay_drv_sainsmart.c
 -LIBS  += -lftdi
 +LIBS  += -lftdi1
  OPTS  += -DDRV_SAINSMART
  endif
- #ifdef DRV_HIDAPI
+ ifeq ($(DRV_SAINSMART16), y)

diff --git a/utils/crelay/patches/020-link_using_LDFLAGS.patch b/utils/crelay/patches/020-link_using_LDFLAGS.patch
index 9154b08cb6adf202ca8814980912ad2681f5b162..5b4a7a2e0c9834108c5152ebe91274564e96a9b1 100644 (file)
--- a/utils/crelay/patches/020-link_using_LDFLAGS.patch
+++ b/utils/crelay/patches/020-link_using_LDFLAGS.patch
@@ -1,6 +1,6 @@
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -61,7 +61,7 @@ all: $(BIN)
+@@ -64,7 +64,7 @@ all: $(BIN)
  
  $(BIN):       $(OBJ)
        @echo "[Link $(BIN)] with libs $(LIBS)"

diff --git a/utils/crelay/patches/030-remove_daemonize_call.patch b/utils/crelay/patches/030-remove_daemonize_call.patch
new file mode 100644 (file)
index 0000000..9b2216e
--- /dev/null
+++ b/utils/crelay/patches/030-remove_daemonize_call.patch
@@ -0,0 +1,15 @@
+--- a/src/crelay.c
++++ b/src/crelay.c
+@@ -678,10 +678,12 @@ int main(int argc, char *argv[])
+       listen(sock, 5);
+       syslog(LOG_DAEMON | LOG_NOTICE, "HTTP server listening on %s:%d\n", inet_ntoa(iface), port);      
+ 
++#if 0
+       if (daemon(0, 0) == -1) {
+             syslog(LOG_DAEMON | LOG_ERR, "Failed to daemonize: %s", strerror(errno));
+             exit(EXIT_FAILURE);
+       }
++#endif
+ 
+       while (1)
+       {