From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001 From: James <> Date: Wed, 4 Nov 2015 11:49:21 +0000 Subject: trunk-47381 --- package/system/ubox/Makefile | 46 ++++++++++++++++++ package/system/ubox/files/log.init | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 package/system/ubox/Makefile create mode 100644 package/system/ubox/files/log.init (limited to 'package/system/ubox') diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile new file mode 100644 index 0000000..a85a3c9 --- /dev/null +++ b/package/system/ubox/Makefile @@ -0,0 +1,46 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=ubox +PKG_VERSION:=2015-07-14 +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=907d046c8929fb74e5a3502a9498198695e62ad8 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +CMAKE_INSTALL:=1 +PKG_CHECK_FORMAT_SECURITY:=0 + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:= + +PKG_MAINTAINER:=John Crispin + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) + +define Package/ubox + SECTION:=base + CATEGORY:=Base system + DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt + TITLE:=OpenWrt system helper toolbox +endef + +define Package/ubox/install + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/etc/init.d/ + + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,logd,logread,validate_data} $(1)/sbin/ + $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib + + $(LN) ../../sbin/kmodloader $(1)/usr/sbin/rmmod + $(LN) ../../sbin/kmodloader $(1)/usr/sbin/insmod + $(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod + $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo + $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe +endef + +$(eval $(call BuildPackage,ubox)) diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init new file mode 100644 index 0000000..4fc00d5 --- /dev/null +++ b/package/system/ubox/files/log.init @@ -0,0 +1,98 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2013 OpenWrt.org + +# start after and stop before networking +START=12 +STOP=89 +PIDCOUNT=0 + +USE_PROCD=1 +PROG=/sbin/logread + +validate_log_section() +{ + uci_validate_section system system "${1}" \ + 'log_file:string' \ + 'log_size:uinteger' \ + 'log_ip:ipaddr' \ + 'log_remote:bool:1' \ + 'log_port:port:514' \ + 'log_proto:or("tcp", "udp"):udp' \ + 'log_trailer_null:bool:0' \ + 'log_prefix:string' +} + +validate_log_daemon() +{ + uci_validate_section system system "${1}" \ + 'log_size:uinteger:0' \ + 'log_buffer_size:uinteger:0' +} + +start_service_daemon() +{ + local log_buffer_size log_size + validate_log_daemon "${1}" + [ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size + [ $log_buffer_size -eq 0 ] && log_buffer_size=16 + procd_open_instance + procd_set_param command "/sbin/logd" + procd_append_param command -S "${log_buffer_size}" + procd_set_param respawn + procd_close_instance +} + +start_service_file() +{ + PIDCOUNT="$(( ${PIDCOUNT} + 1))" + local pid_file="/var/run/logread.${PIDCOUNT}.pid" + local log_file log_size + + validate_log_section "${1}" || { + echo "validation failed" + return 1 + } + [ -z "${log_file}" ] && return + + procd_open_instance + procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file" + [ -n "${log_size}" ] && procd_append_param command -S "$log_size" + procd_close_instance +} + +start_service_remote() +{ + PIDCOUNT="$(( ${PIDCOUNT} + 1))" + local pid_file="/var/run/logread.${PIDCOUNT}.pid" + local log_ip log_port log_proto log_prefix log_remote log_trailer_null + + validate_log_section "${1}" || { + echo "validation failed" + return 1 + } + [ "${log_remote}" -ne 0 ] || return + [ -z "${log_ip}" ] && return + + procd_open_instance + procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file" + case "${log_proto}" in + "udp") procd_append_param command -u;; + "tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;; + esac + [ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}" + procd_close_instance +} + +service_triggers() +{ + procd_add_reload_trigger "system" + procd_add_validation validate_log_section +} + +start_service() +{ + config_load system + config_foreach start_service_daemon system + config_foreach start_service_file system + config_foreach start_service_remote system +} -- cgit v1.2.3