Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

knxd: bump to new version

Browse source 
Signed-off-by: Othmar Truniger <github@truniger.ch>
This commit is contained in:
Othmar Truniger 2017-01-18 22:30:36 +01:00
parent d548d6bf1f
commit efdb8b08c7
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
net/knxd/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2008-2016 OpenWrt.org # Copyright (C) 2008-2017 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -11,12 +11,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=knxd PKG_NAME:=knxd
PKG_VERSION=2016-10-08 PKG_VERSION=2017-01-18
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/knxd/knxd.git PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
PKG_SOURCE_VERSION:=43e90c6ee3028194c8ce6d7776e7dedbe1032dc1 PKG_SOURCE_VERSION:=8255bf08b6e1a972c1489012b570bf0ff8679cb0
PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@ -38,7 +38,7 @@ define Package/knxd
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=EIB KNX daemon TITLE:=EIB KNX daemon
DEPENDS:=+pthsem +libusb-1.0 DEPENDS:=+libusb-1.0 +libstdcpp +libev
endef endef
define Package/knxd/description define Package/knxd/description
@ -53,30 +53,24 @@ define Package/knxd-tools
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=EIB KNX Utils TITLE:=EIB KNX Utils
DEPENDS:=+libstdcpp +libev
endef endef
define Package/knxd-tools/description define Package/knxd-tools/description
EIB KNX Tools EIB KNX Tools
endef endef
TARGET_CXXFLAGS+= -fno-rtti TARGET_CXXFLAGS+= -std=c++0x
TARGET_CXX=$(TARGET_CC) TARGET_CXX=$(TARGET_CC)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-ft12 \
--enable-eibnetip \ --enable-eibnetip \
--enable-eibnetiptunnel \ --enable-eibnetiptunnel \
--enable-eibnetipserver \ --enable-eibnetipserver \
--enable-usb \ --disable-systemd
--enable-tpuarts \
--disable-pei16s \
--enable-groupcache \
--without-pth-test \
--disable-systemd \
--without-libstdc
EXTRA_LDFLAGS+= \ EXTRA_LDFLAGS+= \
-fno-builtin -largp -largp -lstdc++
define Package/knxd/install define Package/knxd/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

10
net/knxd/files/knxd.config
View file

@ -9,16 +9,18 @@ config daemon args
option Discovery 1 option Discovery 1
# EIBADDR set our EIB address to EIBADDR (default 0.0.1) # EIBADDR set our EIB address to EIBADDR (default 0.0.1)
option eibaddr "0.0.1" option eibaddr "0.0.1"
# CLIENT-ADDRS assign addresses ADDRSTART through ADDRSTART+n
option client-addrs "0.0.2:10"
# LEVEL set error level # LEVEL set error level
option error 0 option error 0
# PORT listen at TCP port PORT (default 6720) # PORT listen at TCP port PORT (default 6720)
option listen_tcp "6720" option listen_tcp "6720"
# wait for L_Data_ind while sending (for all EMI based backends) # Interface to use
option no_emisend_queuing 0 option Interface ""
# wait while sending
option send-delay ""
# SERVERNAME name of the EIBnet/IP server (default is 'knxd') # SERVERNAME name of the EIBnet/IP server (default is 'knxd')
option Name "OpenWrt" option Name "OpenWrt"
# do not assume KNXnet/IP Tunneling bus interface can handle parallel cEMI requests
option no_tunnel_client_queuing 0
# the next Layer2 interface may not enter monitor mode # the next Layer2 interface may not enter monitor mode
option no_monitor 0 option no_monitor 0
# enable EIBnet/IP Routing in the EIBnet/IP server # enable EIBnet/IP Routing in the EIBnet/IP server

5
net/knxd/files/knxd.init
View file

@ -33,15 +33,16 @@ start_service() {
local options url local options url
config_load knxd config_load knxd
append_parm args eibaddr "eibaddr" "0.0.1" append_parm args eibaddr "eibaddr" "0.0.1"
append_parm args client-addrs "client-addrs" "0.0.2:10"
append_parm args layer2 "layer2" append_parm args layer2 "layer2"
append_bool args GroupCache "GroupCache" 0 append_bool args GroupCache "GroupCache" 0
append_parm args daemon "daemon" "/var/log/knxd.log" append_parm args daemon "daemon" "/var/log/knxd.log"
append_bool args Discovery "Discovery" 1 append_bool args Discovery "Discovery" 1
append_parm args error "error" # "5" append_parm args error "error" # "5"
append_parm args listen_tcp "listen-tcp" "6720" append_parm args listen_tcp "listen-tcp" "6720"
append_bool args no_emisend_queuing "no-emisend-queuing" 0 append_parm args Interface "Interface" # "eth0"
append_parm args send-delay "send-delay" # "50"
append_parm args Name "Name" "OpenWrt" append_parm args Name "Name" "OpenWrt"
append_bool args no_tunnel_client_queuing "no-tunnel-client-queuing" 0
append_bool args no_monitor "no-monitor" 0 append_bool args no_monitor "no-monitor" 0
append_bool args Routing "Routing" 0 append_bool args Routing "Routing" 0
append_parm args trace "trace" # "7" append_parm args trace "trace" # "7"