From 3e68ea9ab81dfc7d36a04c3800b678476dcaa5b0 Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Sun, 30 Jun 2024 10:50:30 +0200 Subject: [PATCH] stop using random-numgen, not needed in recent OpenWrt --- packages/check-date-http/Makefile | 2 +- .../check-date-http/files/etc/uci-defaults/check-date-http-cron | 2 +- packages/eupgrade/Makefile | 2 +- packages/eupgrade/files/etc/uci-defaults/99-eupgrades-cron | 2 +- packages/hotplug-initd-services/Makefile | 2 +- packages/shared-state-babel_links_info/Makefile | 2 +- packages/shared-state-babeld_hosts/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-babeld_hosts-cron | 2 +- packages/shared-state-dnsmasq_hosts/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-dnsmasq_hosts-cron | 2 +- packages/shared-state-dnsmasq_leases/Makefile | 2 +- .../files/etc/uci-defaults/90_dnsmasq-lease-share | 2 +- packages/shared-state-dnsmasq_servers/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-dnsmasq_servers | 2 +- packages/shared-state-network_nodes/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-network_nodes-cron | 2 +- packages/shared-state-nodes_and_links/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-bat_nodes_and_links | 2 +- packages/shared-state-pirania/Makefile | 2 +- .../shared-state-pirania/files/etc/uci-defaults/90-pirania-cron | 2 +- packages/shared-state/Makefile | 2 +- .../files/etc/uci-defaults/shared-state-publishers-cron | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/check-date-http/Makefile b/packages/check-date-http/Makefile index 868eafd34..cab37f7e5 100644 --- a/packages/check-date-http/Makefile +++ b/packages/check-date-http/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+libuci-lua +lua +random-numgen \ + DEPENDS:=+libuci-lua +lua \ +luci-lib-httpclient PKGARCH:=all endef diff --git a/packages/check-date-http/files/etc/uci-defaults/check-date-http-cron b/packages/check-date-http/files/etc/uci-defaults/check-date-http-cron index 1dc3b4557..41ca9e50c 100755 --- a/packages/check-date-http/files/etc/uci-defaults/check-date-http-cron +++ b/packages/check-date-http/files/etc/uci-defaults/check-date-http-cron @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '*/20 * * * * ((sleep $(($(random-numgen) % 600)); check-date-http &> /dev/null)&)'\ + '*/20 * * * * ((sleep $(($RANDOM % 600)); check-date-http &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/eupgrade/Makefile b/packages/eupgrade/Makefile index fab7708d3..1e51b5fcd 100644 --- a/packages/eupgrade/Makefile +++ b/packages/eupgrade/Makefile @@ -11,7 +11,7 @@ define Package/$(PKG_NAME) CATEGORY:=Utilities TITLE:=$(PKG_NAME) provides semi automated firmware upgrades MAINTAINER:=Santiago Piccinini - DEPENDS:=+lua +lime-system +luci-lib-jsonc +luci-lib-nixio +libubus-lua +libuci-lua +random-numgen + DEPENDS:=+lua +lime-system +luci-lib-jsonc +luci-lib-nixio +libubus-lua +libuci-lua PKGARCH:=all endef diff --git a/packages/eupgrade/files/etc/uci-defaults/99-eupgrades-cron b/packages/eupgrade/files/etc/uci-defaults/99-eupgrades-cron index e1931c549..72bb7acf8 100755 --- a/packages/eupgrade/files/etc/uci-defaults/99-eupgrades-cron +++ b/packages/eupgrade/files/etc/uci-defaults/99-eupgrades-cron @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '0 */6 * * * ((sleep $(($(random-numgen) % 120)); eupgrade-check &> /dev/null)&)'\ + '0 */6 * * * ((sleep $(($RANDOM % 120)); eupgrade-check &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/hotplug-initd-services/Makefile b/packages/hotplug-initd-services/Makefile index e2bbecda1..be1fb06ab 100644 --- a/packages/hotplug-initd-services/Makefile +++ b/packages/hotplug-initd-services/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+libubox-lua +libubus-lua +random-numgen \ + DEPENDS:=+libubox-lua +libubus-lua \ +lua +luci-lib-nixio PKGARCH:=all endef diff --git a/packages/shared-state-babel_links_info/Makefile b/packages/shared-state-babel_links_info/Makefile index 73ea636c1..6b3fb1228 100644 --- a/packages/shared-state-babel_links_info/Makefile +++ b/packages/shared-state-babel_links_info/Makefile @@ -12,7 +12,7 @@ define Package/$(PKG_NAME) TITLE:=Babel links module for shared-state MAINTAINER:=Asociación Civil Altermundi DEPENDS:=+lua +luci-lib-jsonc +ubus-lime-utils \ - +libubus-lua +random-numgen shared-state-async + +libubus-lua shared-state-async PKGARCH:=all endef diff --git a/packages/shared-state-babeld_hosts/Makefile b/packages/shared-state-babeld_hosts/Makefile index e409b6886..070450e84 100644 --- a/packages/shared-state-babeld_hosts/Makefile +++ b/packages/shared-state-babeld_hosts/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+hotplug-initd-services +random-numgen \ + DEPENDS:=+hotplug-initd-services \ +lua +luci-lib-jsonc shared-state PKGARCH:=all endef diff --git a/packages/shared-state-babeld_hosts/files/etc/uci-defaults/shared-state-babeld_hosts-cron b/packages/shared-state-babeld_hosts/files/etc/uci-defaults/shared-state-babeld_hosts-cron index 9ecd8db66..75aa20a50 100755 --- a/packages/shared-state-babeld_hosts/files/etc/uci-defaults/shared-state-babeld_hosts-cron +++ b/packages/shared-state-babeld_hosts/files/etc/uci-defaults/shared-state-babeld_hosts-cron @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state sync babeld-hosts &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state sync babeld-hosts &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/shared-state-dnsmasq_hosts/Makefile b/packages/shared-state-dnsmasq_hosts/Makefile index 010c253ac..e4881f908 100644 --- a/packages/shared-state-dnsmasq_hosts/Makefile +++ b/packages/shared-state-dnsmasq_hosts/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+lua +luci-lib-jsonc +random-numgen \ + DEPENDS:=+lua +luci-lib-jsonc \ shared-state PKGARCH:=all endef diff --git a/packages/shared-state-dnsmasq_hosts/files/etc/uci-defaults/shared-state-dnsmasq_hosts-cron b/packages/shared-state-dnsmasq_hosts/files/etc/uci-defaults/shared-state-dnsmasq_hosts-cron index 63a2803ed..3a941987c 100755 --- a/packages/shared-state-dnsmasq_hosts/files/etc/uci-defaults/shared-state-dnsmasq_hosts-cron +++ b/packages/shared-state-dnsmasq_hosts/files/etc/uci-defaults/shared-state-dnsmasq_hosts-cron @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state sync dnsmasq-hosts &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state sync dnsmasq-hosts &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/shared-state-dnsmasq_leases/Makefile b/packages/shared-state-dnsmasq_leases/Makefile index 09f0f04f0..422fa3a51 100644 --- a/packages/shared-state-dnsmasq_leases/Makefile +++ b/packages/shared-state-dnsmasq_leases/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+libuci-lua +lua +random-numgen \ + DEPENDS:=+libuci-lua +lua \ +luci-lib-jsonc shared-state +shared-state-dnsmasq_hosts \ +luci-lib-nixio PKGARCH:=all diff --git a/packages/shared-state-dnsmasq_leases/files/etc/uci-defaults/90_dnsmasq-lease-share b/packages/shared-state-dnsmasq_leases/files/etc/uci-defaults/90_dnsmasq-lease-share index 701f85121..3c125739d 100755 --- a/packages/shared-state-dnsmasq_leases/files/etc/uci-defaults/90_dnsmasq-lease-share +++ b/packages/shared-state-dnsmasq_leases/files/etc/uci-defaults/90_dnsmasq-lease-share @@ -12,7 +12,7 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state sync dnsmasq-leases &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state sync dnsmasq-leases &> /dev/null)&)'\ /etc/crontabs/root exit 0 diff --git a/packages/shared-state-dnsmasq_servers/Makefile b/packages/shared-state-dnsmasq_servers/Makefile index 1223e6daa..70d21a2dd 100644 --- a/packages/shared-state-dnsmasq_servers/Makefile +++ b/packages/shared-state-dnsmasq_servers/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Gui iribarren URL:=http://libremesh.org - DEPENDS:=+lua +luci-lib-jsonc +random-numgen \ + DEPENDS:=+lua +luci-lib-jsonc \ shared-state PKGARCH:=all endef diff --git a/packages/shared-state-dnsmasq_servers/files/etc/uci-defaults/shared-state-dnsmasq_servers b/packages/shared-state-dnsmasq_servers/files/etc/uci-defaults/shared-state-dnsmasq_servers index 7adb6d63f..a9a29d8bc 100755 --- a/packages/shared-state-dnsmasq_servers/files/etc/uci-defaults/shared-state-dnsmasq_servers +++ b/packages/shared-state-dnsmasq_servers/files/etc/uci-defaults/shared-state-dnsmasq_servers @@ -10,5 +10,5 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state sync dnsmasq-servers &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state sync dnsmasq-servers &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/shared-state-network_nodes/Makefile b/packages/shared-state-network_nodes/Makefile index b6158d2ad..88a91e40c 100644 --- a/packages/shared-state-network_nodes/Makefile +++ b/packages/shared-state-network_nodes/Makefile @@ -11,7 +11,7 @@ define Package/$(PKG_NAME) TITLE:=$(PKG_NAME) provides data-type for network nodes marked as reliable by user MAINTAINER:=Asociacion Civil Altermundi DEPENDS:=+shared-state +shared-state-nodes_and_links +lime-system +luci-lib-jsonc \ - +libubus-lua +random-numgen + +libubus-lua PKGARCH:=all endef diff --git a/packages/shared-state-network_nodes/files/etc/uci-defaults/shared-state-network_nodes-cron b/packages/shared-state-network_nodes/files/etc/uci-defaults/shared-state-network_nodes-cron index dc67e2c8b..a46558999 100644 --- a/packages/shared-state-network_nodes/files/etc/uci-defaults/shared-state-network_nodes-cron +++ b/packages/shared-state-network_nodes/files/etc/uci-defaults/shared-state-network_nodes-cron @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state-multiwriter sync network_nodes &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state-multiwriter sync network_nodes &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/shared-state-nodes_and_links/Makefile b/packages/shared-state-nodes_and_links/Makefile index 6d44bdabc..c17ad8477 100644 --- a/packages/shared-state-nodes_and_links/Makefile +++ b/packages/shared-state-nodes_and_links/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Nicolas Pace URL:=http://libremesh.org - DEPENDS:=+lua +luci-lib-jsonc +random-numgen \ + DEPENDS:=+lua +luci-lib-jsonc \ shared-state +ubus-lime-location PKGARCH:=all endef diff --git a/packages/shared-state-nodes_and_links/files/etc/uci-defaults/shared-state-bat_nodes_and_links b/packages/shared-state-nodes_and_links/files/etc/uci-defaults/shared-state-bat_nodes_and_links index 27a449ee4..2a89d31d7 100755 --- a/packages/shared-state-nodes_and_links/files/etc/uci-defaults/shared-state-bat_nodes_and_links +++ b/packages/shared-state-nodes_and_links/files/etc/uci-defaults/shared-state-bat_nodes_and_links @@ -6,5 +6,5 @@ unique_append() } unique_append \ - '*/5 * * * * ((sleep $(($(random-numgen) % 120)); shared-state sync nodes_and_links &> /dev/null)&)'\ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state sync nodes_and_links &> /dev/null)&)'\ /etc/crontabs/root diff --git a/packages/shared-state-pirania/Makefile b/packages/shared-state-pirania/Makefile index 86f6cf843..c79d1a2db 100644 --- a/packages/shared-state-pirania/Makefile +++ b/packages/shared-state-pirania/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LibreMesh MAINTAINER:=Asociación Civil AlterMundi URL:=http://libremesh.org - DEPENDS:=+lua +luci-lib-jsonc +random-numgen shared-state + DEPENDS:=+lua +luci-lib-jsonc shared-state PKGARCH:=all endef diff --git a/packages/shared-state-pirania/files/etc/uci-defaults/90-pirania-cron b/packages/shared-state-pirania/files/etc/uci-defaults/90-pirania-cron index 0522035de..e40f2d478 100755 --- a/packages/shared-state-pirania/files/etc/uci-defaults/90-pirania-cron +++ b/packages/shared-state-pirania/files/etc/uci-defaults/90-pirania-cron @@ -6,7 +6,7 @@ unique_append() } unique_append \ - '*/2 * * * * ((sleep $(($(random-numgen) % 30)); /etc/shared-state/publishers/shared-state-publish_vouchers && shared-state sync pirania-vouchers &> /dev/null)&)'\ + '*/2 * * * * ((sleep $(($RANDOM % 30)); /etc/shared-state/publishers/shared-state-publish_vouchers && shared-state sync pirania-vouchers &> /dev/null)&)'\ /etc/crontabs/root exit 0 diff --git a/packages/shared-state/Makefile b/packages/shared-state/Makefile index 971081768..b377ddbc0 100644 --- a/packages/shared-state/Makefile +++ b/packages/shared-state/Makefile @@ -20,7 +20,7 @@ define Package/$(PKG_NAME) MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org DEPENDS:=+libuci-lua +lime-system +lua +luci-lib-jsonc +luci-lib-nixio \ - +iputils-ping +uclient-fetch +random-numgen + +iputils-ping +uclient-fetch PKGARCH:=all endef diff --git a/packages/shared-state/files/etc/uci-defaults/shared-state-publishers-cron b/packages/shared-state/files/etc/uci-defaults/shared-state-publishers-cron index c1fbde161..cc14b3748 100755 --- a/packages/shared-state/files/etc/uci-defaults/shared-state-publishers-cron +++ b/packages/shared-state/files/etc/uci-defaults/shared-state-publishers-cron @@ -6,7 +6,7 @@ unique_append() } unique_append \ - '*/30 * * * * ((sleep $(($(random-numgen) % 1000)); shared-state-publish-all &> /dev/null)&)'\ + '*/30 * * * * ((sleep $(($RANDOM % 1000)); shared-state-publish-all &> /dev/null)&)'\ /etc/crontabs/root unique_append \