mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

timemngr: 1.1.0

Browse source
This commit is contained in:
Amin Ben Romdhane 2024-08-29 11:59:02 +02:00
parent 4b5a232a9e
commit ded9e8d248
2 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
timemngr/Makefile
View file

@ -5,13 +5,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=timemngr PKG_NAME:=timemngr
PKG_VERSION:=1.0.22 PKG_VERSION:=1.1.0
LOCAL_DEV:=0 LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1) ifneq ($(LOCAL_DEV),1)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
PKG_SOURCE_VERSION:=d0dedf229e24535b5b6a284662f1560868fdcd7c PKG_SOURCE_VERSION:=524495fc46987eab80eacdd5f2349b2fbd5efb23
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip
endif endif
@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=TRx69 SUBMENU:=TRx69
TITLE:=Time manager daemon based on ntpd TITLE:=Time manager daemon based on ntpd
DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus +libbbfdm-api +libbbfdm-ubus +@BUSYBOX_CONFIG_PGREP
MENU:=1 MENU:=1
endef endef
@ -59,11 +59,10 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
ifeq ($(CONFIG_TIMEMNGR_LEGACY_DM),y) ifeq ($(CONFIG_TIMEMNGR_LEGACY_DM),y)
$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time_legacy.so $(1) $(PKG_NAME) $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time_legacy.so $(1) $(PKG_NAME)
else else
$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time.so $(1) $(PKG_NAME) $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y) ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y)
$(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/
endif endif
@ -81,5 +80,4 @@ ifeq ($(CONFIG_TIMEMNGR_VENDOR_EXTENSIONS),y)
endif endif
endef endef
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)))

26
timemngr/files/etc/init.d/timemngr
View file

@ -9,7 +9,7 @@ USE_PROCD=1
PROG_UBUS=/usr/sbin/timemngr PROG_UBUS=/usr/sbin/timemngr
log() { log() {
echo "${@}"|logger -t time.init -p info echo "${@}"|logger -t timemngr.init -p info
} }
validate_global_section() { validate_global_section() {
@ -20,42 +20,38 @@ validate_global_section() {
} }
start_service() { start_service() {
local enable loglevel server_enable local enable loglevel server_enable mdns
if uci -q get system.ntp >/dev/null 2>&1; then if uci -q get system.ntp >/dev/null 2>&1; then
log "Not starting timemngr, legacy ntp definition detected" log "Not starting timemngr, legacy ntp definition detected"
return 1 return 1
fi fi
validate_global_section || { config_load time
return 1
}
if [ "$enable" != 1 ]; then validate_global_section
return 1
fi
procd_open_instance timemngr_ubus # Start timemngr_dm instance
procd_open_instance timemngr_dm
procd_set_param command $PROG_UBUS procd_set_param command $PROG_UBUS
procd_append_param command -l ${loglevel} procd_append_param command -l ${loglevel}
procd_set_param respawn
procd_close_instance
config_load time
config_get_bool server_enable server enable 0 config_get_bool server_enable server enable 0
if [ "${server_enable}" -eq 1 ]; then if [ "${server_enable}" -eq 1 ]; then
[ "${mdns}" -ne 0 ] && procd_add_mdns "ntp" "udp" "123" "daemon=ntpd" [ "${mdns}" -ne 0 ] && procd_add_mdns "ntp" "udp" "123" "daemon=ntpd"
fi fi
procd_set_param respawn # Generate Config & Start timemngr instance
procd_close_instance
generate_config generate_config
create_service create_service
} }
reload_service() { reload_service() {
log "Restarting timemngr" log "Reloading timemngr instance"
stop stop "timemngr"
start start
} }