diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index 30671b18..ca437458 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -18,7 +18,7 @@ GLUON_FEATURES := \ web-wizard GLUON_FEATURES_standard := \ - wireless-encryption-wpa3 + wireless-encryption-wpa3 ## GLUON_SITE_PACKAGES # Specify additional Gluon/OpenWrt packages to include here; diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile index fd7e7120..1c0336ae 100644 --- a/package/gluon-alfred/Makefile +++ b/package/gluon-alfred/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-alfred include ../gluon.mk define Package/gluon-alfred - DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +alfred - TITLE:=Configure alfred + DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +alfred + TITLE:=Configure alfred endef $(eval $(call BuildPackageGluon,gluon-alfred)) diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile index 3cbca241..237faa90 100644 --- a/package/gluon-authorized-keys/Makefile +++ b/package/gluon-authorized-keys/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-authorized-keys include ../gluon.mk define Package/gluon-authorized-keys - TITLE:=Fill /etc/dropbear/authorized_keys from site.conf - DEPENDS:=+gluon-core +gluon-lock-password + TITLE:=Fill /etc/dropbear/authorized_keys from site.conf + DEPENDS:=+gluon-core +gluon-lock-password endef $(eval $(call BuildPackageGluon,gluon-authorized-keys)) diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index 61a8ba21..0ffca2dd 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -7,8 +7,8 @@ PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_E include ../gluon.mk define Package/gluon-autoupdater - DEPENDS:=+gluon-core +libgluonutil +micrond +autoupdater - TITLE:=Automatically update firmware + DEPENDS:=+gluon-core +libgluonutil +micrond +autoupdater + TITLE:=Automatically update firmware endef define Package/gluon-autoupdater/config @@ -19,12 +19,12 @@ define Package/gluon-autoupdater/install $(Gluon/Build/Install) $(INSTALL_DIR) $(1)/lib/gluon/autoupdater - ifneq ($(CONFIG_GLUON_AUTOUPDATER_BRANCH),"") + ifneq ($(CONFIG_GLUON_AUTOUPDATER_BRANCH),"") echo '$(call qstrip,$(CONFIG_GLUON_AUTOUPDATER_BRANCH))' > $(1)/lib/gluon/autoupdater/default_branch - endif - ifneq ($(CONFIG_GLUON_AUTOUPDATER_ENABLED),) + endif + ifneq ($(CONFIG_GLUON_AUTOUPDATER_ENABLED),) touch $(1)/lib/gluon/autoupdater/default_enabled - endif + endif endef $(eval $(call BuildPackageGluon,gluon-autoupdater)) diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile index d1005d86..12e67bb4 100644 --- a/package/gluon-client-bridge/Makefile +++ b/package/gluon-client-bridge/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-client-bridge include ../gluon.mk define Package/gluon-client-bridge - TITLE:=Provides a bridge and a wireless interface for clients to connect to - DEPENDS:=+gluon-core +kmod-veth + TITLE:=Provides a bridge and a wireless interface for clients to connect to + DEPENDS:=+gluon-core +kmod-veth endef $(eval $(call BuildPackageGluon,gluon-client-bridge)) diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index d5a9d7f7..3154d083 100644 --- a/package/gluon-config-mode-autoupdater/Makefile +++ b/package/gluon-config-mode-autoupdater/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-autoupdater include ../gluon.mk define Package/gluon-config-mode-autoupdater - TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not - DEPENDS:=+gluon-config-mode-core +gluon-autoupdater + TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not + DEPENDS:=+gluon-config-mode-core +gluon-autoupdater endef $(eval $(call BuildPackageGluon,gluon-config-mode-autoupdater)) diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index d7382b58..aa2006ec 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-contact-info include ../gluon.mk define Package/gluon-config-mode-contact-info - TITLE:=Allows the user to provide contact information to be distributed in the mesh - DEPENDS:=+gluon-config-mode-core +gluon-node-info + TITLE:=Allows the user to provide contact information to be distributed in the mesh + DEPENDS:=+gluon-config-mode-core +gluon-node-info endef $(eval $(call BuildPackageGluon,gluon-config-mode-contact-info)) diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 0c3a0f42..051d4ac6 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-config-mode-core include ../gluon.mk define Package/gluon-config-mode-core - TITLE:=Configuration wizard for user friendly setup of new mesh nodes - DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd + TITLE:=Configuration wizard for user friendly setup of new mesh nodes + DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd endef define Package/gluon-config-mode-core/install diff --git a/package/gluon-config-mode-domain-select/Makefile b/package/gluon-config-mode-domain-select/Makefile index 98897752..f57bb1eb 100644 --- a/package/gluon-config-mode-domain-select/Makefile +++ b/package/gluon-config-mode-domain-select/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-domain-select include ../gluon.mk define Package/gluon-config-mode-domain-select - TITLE:=UI for changing the node-config - DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN + TITLE:=UI for changing the node-config + DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN endef $(eval $(call BuildPackageGluon,gluon-config-mode-domain-select)) diff --git a/package/gluon-config-mode-geo-location-osm/Makefile b/package/gluon-config-mode-geo-location-osm/Makefile index 2e101223..674a3387 100644 --- a/package/gluon-config-mode-geo-location-osm/Makefile +++ b/package/gluon-config-mode-geo-location-osm/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-geo-location-osm include ../gluon.mk define Package/gluon-config-mode-geo-location-osm - TITLE:=Set geographic location of a node (map support) - DEPENDS:=+gluon-config-mode-geo-location +gluon-web-osm + TITLE:=Set geographic location of a node (map support) + DEPENDS:=+gluon-config-mode-geo-location +gluon-web-osm endef define Package/gluon-config-mode-geo-location-osm/install diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index 7c7f8079..88c609f8 100644 --- a/package/gluon-config-mode-geo-location/Makefile +++ b/package/gluon-config-mode-geo-location/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-geo-location include ../gluon.mk define Package/gluon-config-mode-geo-location - TITLE:=Set geographic location of a node - DEPENDS:=+gluon-config-mode-core +gluon-node-info + TITLE:=Set geographic location of a node + DEPENDS:=+gluon-config-mode-core +gluon-node-info endef $(eval $(call BuildPackageGluon,gluon-config-mode-geo-location)) diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index 8285f5bb..6cb77f58 100644 --- a/package/gluon-config-mode-hostname/Makefile +++ b/package/gluon-config-mode-hostname/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-hostname include ../gluon.mk define Package/gluon-config-mode-hostname - TITLE:=Set the hostname - DEPENDS:=+gluon-config-mode-core + TITLE:=Set the hostname + DEPENDS:=+gluon-config-mode-core endef $(eval $(call BuildPackageGluon,gluon-config-mode-hostname)) diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index b55d532a..38835542 100644 --- a/package/gluon-config-mode-mesh-vpn/Makefile +++ b/package/gluon-config-mode-mesh-vpn/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-mesh-vpn include ../gluon.mk define Package/gluon-config-mode-mesh-vpn - TITLE:=Toggle mesh-vpn and bandwidth limit - DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core + TITLE:=Toggle mesh-vpn and bandwidth limit + DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core endef $(eval $(call BuildPackageGluon,gluon-config-mode-mesh-vpn)) diff --git a/package/gluon-config-mode-outdoor/Makefile b/package/gluon-config-mode-outdoor/Makefile index 049cf52e..12983379 100644 --- a/package/gluon-config-mode-outdoor/Makefile +++ b/package/gluon-config-mode-outdoor/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-config-mode-outdoor include ../gluon.mk define Package/gluon-config-mode-outdoor - TITLE:=UI for displaying & changing the outdoor mode flag in the wizard - DEPENDS:=+gluon-config-mode-core + TITLE:=UI for displaying & changing the outdoor mode flag in the wizard + DEPENDS:=+gluon-config-mode-core endef $(eval $(call BuildPackageGluon,gluon-config-mode-outdoor)) diff --git a/package/gluon-config-mode-theme/Makefile b/package/gluon-config-mode-theme/Makefile index 7f20fbdb..215117f3 100644 --- a/package/gluon-config-mode-theme/Makefile +++ b/package/gluon-config-mode-theme/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-config-mode-theme include ../gluon.mk define Package/gluon-config-mode-theme - TITLE:=Gluon config mode theme for gluon-web - DEPENDS:=+gluon-core +gluon-web + TITLE:=Gluon config mode theme for gluon-web + DEPENDS:=+gluon-core +gluon-web endef $(eval $(call BuildPackageGluon,gluon-config-mode-theme)) diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 93b2d599..611b6f16 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -8,8 +8,8 @@ include ../gluon.mk include $(INCLUDE_DIR)/cmake.mk define Package/gluon-core - TITLE:=Base files of Gluon - DEPENDS:= \ + TITLE:=Base files of Gluon + DEPENDS:= \ +gluon-site +libgluonutil +libiwinfo-lua +lua-platform-info +lua-simple-uci +lua-hash +lua-jsonc \ +luabitop +luaposix +vxlan +odhcp6c +firewall +pretty-hostname endef diff --git a/package/gluon-ebtables-filter-multicast/Makefile b/package/gluon-ebtables-filter-multicast/Makefile index 92b2be2a..37ff8859 100644 --- a/package/gluon-ebtables-filter-multicast/Makefile +++ b/package/gluon-ebtables-filter-multicast/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-ebtables-filter-multicast include ../gluon.mk define Package/gluon-ebtables-filter-multicast - TITLE:=Ebtables filters for multicast packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + TITLE:=Ebtables filters for multicast packets + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef define Package/gluon-ebtables-filter-multicast/description diff --git a/package/gluon-ebtables-filter-ra-dhcp/Makefile b/package/gluon-ebtables-filter-ra-dhcp/Makefile index bc52747a..075e195d 100644 --- a/package/gluon-ebtables-filter-ra-dhcp/Makefile +++ b/package/gluon-ebtables-filter-ra-dhcp/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-ebtables-filter-ra-dhcp include ../gluon.mk define Package/gluon-ebtables-filter-ra-dhcp - TITLE:=Ebtables filters for Router Advertisement and DHCP packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + TITLE:=Ebtables filters for Router Advertisement and DHCP packets + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef define Package/gluon-ebtables-filter-ra-dhcp/description diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile index 5f71b1c8..8831f41e 100644 --- a/package/gluon-ebtables-limit-arp/Makefile +++ b/package/gluon-ebtables-limit-arp/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-ebtables-limit-arp include ../gluon.mk define Package/gluon-ebtables-limit-arp - TITLE:=Ebtables limiter for ARP packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + TITLE:=Ebtables limiter for ARP packets + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef define Package/gluon-ebtables-limit-arp/description diff --git a/package/gluon-ebtables-source-filter/Makefile b/package/gluon-ebtables-source-filter/Makefile index 17377e1f..cabcf562 100644 --- a/package/gluon-ebtables-source-filter/Makefile +++ b/package/gluon-ebtables-source-filter/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-ebtables-source-filter include ../gluon.mk define Package/gluon-ebtables-source-filter - TITLE:=Ebtables rules to filter unreasonable L2 traffic. - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + TITLE:=Ebtables rules to filter unreasonable L2 traffic. + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef define Package/gluon-ebtables-source-filter/description diff --git a/package/gluon-ebtables/Makefile b/package/gluon-ebtables/Makefile index e69a83bf..0d59cae9 100644 --- a/package/gluon-ebtables/Makefile +++ b/package/gluon-ebtables/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-ebtables include ../gluon.mk define Package/gluon-ebtables - TITLE:=Ebtables support - DEPENDS:=+gluon-core +ebtables-tiny \ + TITLE:=Ebtables support + DEPENDS:=+gluon-core +ebtables-tiny \ +kmod-ebtables +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 endef diff --git a/package/gluon-hoodselector/Makefile b/package/gluon-hoodselector/Makefile index 9706a605..27a3e757 100644 --- a/package/gluon-hoodselector/Makefile +++ b/package/gluon-hoodselector/Makefile @@ -5,17 +5,17 @@ PKG_NAME:=gluon-hoodselector include ../gluon.mk define Package/gluon-hoodselector - TITLE:=Automatically migrate nodes between domains. - DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +luabitop @GLUON_MULTIDOMAIN - CONFLICTS:=+gluon-config-mode-domain-select + TITLE:=Automatically migrate nodes between domains. + DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +luabitop @GLUON_MULTIDOMAIN + CONFLICTS:=+gluon-config-mode-domain-select endef define Package/gluon-hoodselector/description - Hoodselector automatically detects in which domain the node is - located based on its geolocation settings. Domains require - bounding boxes defined as polygons or rectangles. Hoodselector - selects a domain from the list of known domains and migrate - towards it without requiring a reboot. + Hoodselector automatically detects in which domain the node is + located based on its geolocation settings. Domains require + bounding boxes defined as polygons or rectangles. Hoodselector + selects a domain from the list of known domains and migrate + towards it without requiring a reboot. endef $(eval $(call BuildPackageGluon,gluon-hoodselector)) diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile index d5d91443..d931cf23 100644 --- a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile +++ b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-iptables-clamp-mss-to-pmtu include ../gluon.mk define Package/$(PKG_NAME) - TITLE:=This will establish a firewall rule to clamp the mss to pmtu on the mesh-vpn interface when the connection is towards 64:ff9b::/96 - DEPENDS:= +ip6tables-zz-legacy + TITLE:=This will establish a firewall rule to clamp the mss to pmtu on the mesh-vpn interface when the connection is towards 64:ff9b::/96 + DEPENDS:= +ip6tables-zz-legacy endef define Package/$(PKG_NAME)/description diff --git a/package/gluon-l3roamd/Makefile b/package/gluon-l3roamd/Makefile index 4259bb85..09dc66c8 100644 --- a/package/gluon-l3roamd/Makefile +++ b/package/gluon-l3roamd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-l3roamd include ../gluon.mk define Package/gluon-l3roamd - TITLE:=Configure l3roamd for babel - DEPENDS:=+gluon-core +l3roamd +uc + TITLE:=Configure l3roamd for babel + DEPENDS:=+gluon-core +l3roamd +uc endef $(eval $(call BuildPackageGluon,gluon-l3roamd)) diff --git a/package/gluon-lock-password/Makefile b/package/gluon-lock-password/Makefile index 2275d33e..748e9ef2 100644 --- a/package/gluon-lock-password/Makefile +++ b/package/gluon-lock-password/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-lock-password include ../gluon.mk define Package/gluon-lock-password - TITLE:=Locks the root account by default - DEPENDS:=+gluon-core + TITLE:=Locks the root account by default + DEPENDS:=+gluon-core endef define Package/gluon-lock-password/description diff --git a/package/gluon-logging/Makefile b/package/gluon-logging/Makefile index dde7bcd2..b58b9838 100644 --- a/package/gluon-logging/Makefile +++ b/package/gluon-logging/Makefile @@ -5,9 +5,9 @@ PKG_NAME:=gluon-logging include ../gluon.mk define Package/gluon-logging - TITLE:=Configure remote syslog from site.conf - DEPENDS:=+gluon-core - CONFLICTS:=gluon-web-logging + TITLE:=Configure remote syslog from site.conf + DEPENDS:=+gluon-core + CONFLICTS:=gluon-web-logging endef $(eval $(call BuildPackageGluon,gluon-logging)) diff --git a/package/gluon-mesh-babel/Makefile b/package/gluon-mesh-babel/Makefile index 239d7132..2e9df449 100644 --- a/package/gluon-mesh-babel/Makefile +++ b/package/gluon-mesh-babel/Makefile @@ -8,9 +8,9 @@ PKG_BUILD_DEPENDS += libjson-c include ../gluon.mk define Package/gluon-mesh-babel - TITLE:=Babel mesh - DEPENDS:=+gluon-core +babeld +gluon-mesh-layer3-common +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper +luabitop - PROVIDES:=gluon-mesh-provider + TITLE:=Babel mesh + DEPENDS:=+gluon-core +babeld +gluon-mesh-layer3-common +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper +luabitop + PROVIDES:=gluon-mesh-provider endef define Package/gluon-mesh-babel/install diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index aac41f1b..9ad68322 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -5,9 +5,9 @@ PKG_NAME:=gluon-mesh-batman-adv include ../gluon.mk define Package/gluon-mesh-batman-adv-15 - PROVIDES:=gluon-mesh-batman-adv - TITLE:=Support for batman-adv meshing (compat level 15) - DEPENDS+= \ + PROVIDES:=gluon-mesh-batman-adv + TITLE:=Support for batman-adv meshing (compat level 15) + DEPENDS+= \ +kmod-batman-adv \ +gluon-core \ +libgluonutil \ diff --git a/package/gluon-mesh-batman-adv/src/Makefile b/package/gluon-mesh-batman-adv/src/Makefile index e72dce56..acaaee2c 100644 --- a/package/gluon-mesh-batman-adv/src/Makefile +++ b/package/gluon-mesh-batman-adv/src/Makefile @@ -3,30 +3,30 @@ all: respondd.so CFLAGS += -Wall ifeq ($(origin PKG_CONFIG), undefined) - PKG_CONFIG = pkg-config - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) - $(error $(PKG_CONFIG) not found) - endif + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif endif ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined) - LIBNL_NAME ?= libnl-tiny - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) - $(error No $(LIBNL_NAME) development libraries found!) - endif - LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) - LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) + LIBNL_NAME ?= libnl-tiny + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) + $(error No $(LIBNL_NAME) development libraries found!) + endif + LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) + LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) endif CFLAGS += $(LIBNL_CFLAGS) LDLIBS += $(LIBNL_LDLIBS) ifeq ($(origin LIBBATADV_CFLAGS) $(origin LIBBATADV_LDLIBS), undefined undefined) - LIBBATADV_NAME ?= libbatadv - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) - $(error No $(LIBBATADV_NAME) development libraries found!) - endif - LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) - LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) + LIBBATADV_NAME ?= libbatadv + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) + $(error No $(LIBBATADV_NAME) development libraries found!) + endif + LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) + LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) endif CFLAGS += $(LIBBATADV_CFLAGS) LDLIBS += $(LIBBATADV_LDLIBS) diff --git a/package/gluon-mesh-layer3-common/Makefile b/package/gluon-mesh-layer3-common/Makefile index 45ad2f57..c1cc01a8 100644 --- a/package/gluon-mesh-layer3-common/Makefile +++ b/package/gluon-mesh-layer3-common/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mesh-layer3-common include ../gluon.mk define Package/gluon-mesh-layer3-common - TITLE:=Layer3 common files - DEPENDS:=+gluon-core +gluon-mmfd +firewall + TITLE:=Layer3 common files + DEPENDS:=+gluon-core +gluon-mmfd +firewall endef $(eval $(call BuildPackageGluon,gluon-mesh-layer3-common)) diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile index 2111c7ce..817c3374 100644 --- a/package/gluon-mesh-vpn-core/Makefile +++ b/package/gluon-mesh-vpn-core/Makefile @@ -5,9 +5,9 @@ PKG_NAME:=gluon-mesh-vpn-core include ../gluon.mk define Package/gluon-mesh-vpn-core - TITLE:=Basic support for connecting meshes via VPN tunnels - DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-zz-legacy +iptables-mod-extra +simple-tc - USERID:=:gluon-mesh-vpn=800 + TITLE:=Basic support for connecting meshes via VPN tunnels + DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-zz-legacy +iptables-mod-extra +simple-tc + USERID:=:gluon-mesh-vpn=800 endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-core)) diff --git a/package/gluon-mesh-vpn-fastd-l2tp/Makefile b/package/gluon-mesh-vpn-fastd-l2tp/Makefile index 7a1270ac..c82be602 100644 --- a/package/gluon-mesh-vpn-fastd-l2tp/Makefile +++ b/package/gluon-mesh-vpn-fastd-l2tp/Makefile @@ -6,8 +6,8 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-mesh-vpn-fastd-l2tp - TITLE:=Support for connecting meshes via fastd (with L2TP kernel offloading) - DEPENDS:=+gluon-core +gluon-mesh-vpn-fastd +kmod-l2tp-eth + TITLE:=Support for connecting meshes via fastd (with L2TP kernel offloading) + DEPENDS:=+gluon-core +gluon-mesh-vpn-fastd +kmod-l2tp-eth endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-fastd-l2tp)) diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index cb6f6da4..3dc7bd77 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mesh-vpn-fastd include ../gluon.mk define Package/gluon-mesh-vpn-fastd - TITLE:=Support for connecting meshes via fastd - DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd + TITLE:=Support for connecting meshes via fastd + DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-fastd)) diff --git a/package/gluon-mesh-vpn-tunneldigger/Makefile b/package/gluon-mesh-vpn-tunneldigger/Makefile index 3a206e81..1f9b2af7 100644 --- a/package/gluon-mesh-vpn-tunneldigger/Makefile +++ b/package/gluon-mesh-vpn-tunneldigger/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mesh-vpn-tunneldigger include ../gluon.mk define Package/gluon-mesh-vpn-tunneldigger - TITLE:=Support for connecting meshes via tunneldigger/L2TPv3 pseudowire - DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger + TITLE:=Support for connecting meshes via tunneldigger/L2TPv3 pseudowire + DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-tunneldigger)) diff --git a/package/gluon-mesh-vpn-wireguard/Makefile b/package/gluon-mesh-vpn-wireguard/Makefile index 61c53332..514bcf4c 100644 --- a/package/gluon-mesh-vpn-wireguard/Makefile +++ b/package/gluon-mesh-vpn-wireguard/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mesh-vpn-wireguard include ../gluon.mk define Package/gluon-mesh-vpn-wireguard - TITLE:=Support for connecting meshes via wireguard - DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +wireguard-tools +wgpeerselector +libubus + TITLE:=Support for connecting meshes via wireguard + DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +wireguard-tools +wgpeerselector +libubus endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-wireguard)) diff --git a/package/gluon-mesh-wireless-sae/Makefile b/package/gluon-mesh-wireless-sae/Makefile index 6b3fd271..f1daa269 100644 --- a/package/gluon-mesh-wireless-sae/Makefile +++ b/package/gluon-mesh-wireless-sae/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mesh-wireless-sae include ../gluon.mk define Package/gluon-mesh-wireless-sae - TITLE:=Encryption of 802.11s Mesh Links through SAE - DEPENDS:=+gluon-core +wpa-supplicant-mesh-wolfssl + TITLE:=Encryption of 802.11s Mesh Links through SAE + DEPENDS:=+gluon-core +wpa-supplicant-mesh-wolfssl endef $(eval $(call BuildPackageGluon,gluon-mesh-wireless-sae)) diff --git a/package/gluon-mmfd/Makefile b/package/gluon-mmfd/Makefile index 4e767db5..7f8a43d0 100644 --- a/package/gluon-mmfd/Makefile +++ b/package/gluon-mmfd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-mmfd include ../gluon.mk define Package/gluon-mmfd - TITLE:=Mesh multicast forwarding daemon - Gluon integration - DEPENDS:=+mmfd +uc +gluon-core + TITLE:=Mesh multicast forwarding daemon - Gluon integration + DEPENDS:=+mmfd +uc +gluon-core endef $(eval $(call BuildPackageGluon,gluon-mmfd)) diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile index 903cb02c..ddf43f68 100644 --- a/package/gluon-neighbour-info/Makefile +++ b/package/gluon-neighbour-info/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-neighbour-info include ../gluon.mk define Package/gluon-neighbour-info - TITLE:=neighbour-info - DEPENDS:= + TITLE:=neighbour-info + DEPENDS:= endef define Package/gluon-neighbour-info/description diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile index 20bae57b..ff0c6a30 100644 --- a/package/gluon-node-info/Makefile +++ b/package/gluon-node-info/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-node-info include ../gluon.mk define Package/gluon-node-info - TITLE:=Add /etc/config/gluon-node-info to uci - DEPENDS:=+gluon-core +libgluonutil + TITLE:=Add /etc/config/gluon-node-info to uci + DEPENDS:=+gluon-core +libgluonutil endef define Package/gluon-node-info/conffiles diff --git a/package/gluon-private-wifi/Makefile b/package/gluon-private-wifi/Makefile index 0e0080ae..89ac6493 100644 --- a/package/gluon-private-wifi/Makefile +++ b/package/gluon-private-wifi/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-private-wifi include ../gluon.mk define Package/gluon-private-wifi - TITLE:=Provides a virtual access point for the nodes WAN network - DEPENDS:=+gluon-core + TITLE:=Provides a virtual access point for the nodes WAN network + DEPENDS:=+gluon-core endef $(eval $(call BuildPackageGluon,gluon-private-wifi)) diff --git a/package/gluon-radv-filterd/Makefile b/package/gluon-radv-filterd/Makefile index 4cab8960..2265f294 100644 --- a/package/gluon-radv-filterd/Makefile +++ b/package/gluon-radv-filterd/Makefile @@ -5,13 +5,13 @@ PKG_NAME:=gluon-radv-filterd include ../gluon.mk define Package/gluon-radv-filterd - TITLE:=Filter IPv6 router advertisements - DEPENDS:=+gluon-ebtables +libgluonutil +libbatadv +libnl-tiny + TITLE:=Filter IPv6 router advertisements + DEPENDS:=+gluon-ebtables +libgluonutil +libbatadv +libnl-tiny endef MAKE_VARS += \ - LIBNL_NAME="libnl-tiny" \ - LIBNL_GENL_NAME="libnl-tiny" + LIBNL_NAME="libnl-tiny" \ + LIBNL_GENL_NAME="libnl-tiny" define Package/gluon-radv-filterd/install $(Gluon/Build/Install) diff --git a/package/gluon-radv-filterd/src/Makefile b/package/gluon-radv-filterd/src/Makefile index 17b65584..e5b53909 100644 --- a/package/gluon-radv-filterd/src/Makefile +++ b/package/gluon-radv-filterd/src/Makefile @@ -3,41 +3,41 @@ all: gluon-radv-filterd respondd.so CPPFLAGS += -D_GNU_SOURCE ifeq ($(origin PKG_CONFIG), undefined) - PKG_CONFIG = pkg-config - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) - $(error $(PKG_CONFIG) not found) - endif + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif endif ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined) - LIBNL_NAME ?= libnl-3.0 - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) - $(error No $(LIBNL_NAME) development libraries found!) - endif - LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) - LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) + LIBNL_NAME ?= libnl-3.0 + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) + $(error No $(LIBNL_NAME) development libraries found!) + endif + LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) + LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) endif CFLAGS += $(LIBNL_CFLAGS) LDLIBS += $(LIBNL_LDLIBS) ifeq ($(origin LIBNL_GENL_CFLAGS) $(origin LIBNL_GENL_LDLIBS), undefined undefined) - LIBNL_GENL_NAME ?= libnl-genl-3.0 - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_GENL_NAME) 2>/dev/null),) - $(error No $(LIBNL_GENL_NAME) development libraries found!) - endif - LIBNL_GENL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_GENL_NAME)) - LIBNL_GENL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_GENL_NAME)) + LIBNL_GENL_NAME ?= libnl-genl-3.0 + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_GENL_NAME) 2>/dev/null),) + $(error No $(LIBNL_GENL_NAME) development libraries found!) + endif + LIBNL_GENL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_GENL_NAME)) + LIBNL_GENL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_GENL_NAME)) endif CFLAGS += $(LIBNL_GENL_CFLAGS) LDLIBS += $(LIBNL_GENL_LDLIBS) ifeq ($(origin LIBBATADV_CFLAGS) $(origin LIBBATADV_LDLIBS), undefined undefined) - LIBBATADV_NAME ?= libbatadv - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) - $(error No $(LIBBATADV_NAME) development libraries found!) - endif - LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) - LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) + LIBBATADV_NAME ?= libbatadv + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) + $(error No $(LIBBATADV_NAME) development libraries found!) + endif + LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) + LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) endif CFLAGS += $(LIBBATADV_CFLAGS) LDLIBS += $(LIBBATADV_LDLIBS) diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index 430374e4..c8fde8d0 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-radvd include ../gluon.mk define Package/gluon-radvd - TITLE:=Advertise an IPv6 prefix from the node - DEPENDS:=+gluon-core +uradvd + TITLE:=Advertise an IPv6 prefix from the node + DEPENDS:=+gluon-core +uradvd endef define Package/gluon-radvd/description diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile index 2fda9007..6cb80f6f 100644 --- a/package/gluon-respondd/Makefile +++ b/package/gluon-respondd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-respondd include ../gluon.mk define Package/gluon-respondd - TITLE:=Provides node information to the network - DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd + TITLE:=Provides node information to the network + DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd endef $(eval $(call BuildPackageGluon,gluon-respondd)) diff --git a/package/gluon-scheduled-domain-switch/Makefile b/package/gluon-scheduled-domain-switch/Makefile index 6d79c221..9c9082b7 100644 --- a/package/gluon-scheduled-domain-switch/Makefile +++ b/package/gluon-scheduled-domain-switch/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-scheduled-domain-switch include ../gluon.mk define Package/gluon-scheduled-domain-switch - TITLE:=Allows scheduled migrations between domains - DEPENDS:=+gluon-core @GLUON_MULTIDOMAIN + TITLE:=Allows scheduled migrations between domains + DEPENDS:=+gluon-core @GLUON_MULTIDOMAIN endef $(eval $(call BuildPackageGluon,gluon-scheduled-domain-switch)) diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index 5ee9117c..6e8aea64 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-setup-mode include ../gluon.mk define Package/gluon-setup-mode - TITLE:=Setup mode - DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq + TITLE:=Setup mode + DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq endef define Package/gluon-setup-mode/description diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile index 4bad6ec1..e4254d16 100644 --- a/package/gluon-site/Makefile +++ b/package/gluon-site/Makefile @@ -13,7 +13,7 @@ include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) define Package/gluon-site - TITLE:=Site-specific files of Gluon + TITLE:=Site-specific files of Gluon endef define Package/gluon-site/config @@ -46,7 +46,7 @@ endef define Build/Compile $(call GenerateJSON,site) - ifdef CONFIG_GLUON_MULTIDOMAIN + ifdef CONFIG_GLUON_MULTIDOMAIN rm -rf $(PKG_BUILD_DIR)/domains mkdir -p $(PKG_BUILD_DIR)/domains $(foreach domain,$(patsubst $(GLUON_SITEDIR)/domains/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)), @@ -71,7 +71,7 @@ define Build/Compile fi; \ done ) - endif + endif $(call GluonBuildI18N,$(GLUON_SITEDIR)/i18n) endef @@ -80,9 +80,9 @@ define Package/gluon-site/install $(INSTALL_DIR) $(1)/lib/gluon $(INSTALL_DATA) $(PKG_BUILD_DIR)/site.json $(1)/lib/gluon/ - ifdef CONFIG_GLUON_MULTIDOMAIN + ifdef CONFIG_GLUON_MULTIDOMAIN $(CP) $(PKG_BUILD_DIR)/domains $(1)/lib/gluon/ - endif + endif echo '$(call qstrip,$(CONFIG_GLUON_SITE_VERSION))' > $(1)/lib/gluon/site-version echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release diff --git a/package/gluon-state-check/Makefile b/package/gluon-state-check/Makefile index 14028d88..362720ec 100644 --- a/package/gluon-state-check/Makefile +++ b/package/gluon-state-check/Makefile @@ -5,23 +5,23 @@ PKG_NAME:=gluon-state-check include ../gluon.mk define Package/gluon-state-check - TITLE:=Provides info about the routers state - DEPENDS:=+gluon-core +micrond + TITLE:=Provides info about the routers state + DEPENDS:=+gluon-core +micrond endef define Package/gluon-state-check/description - gluon-state-check executes checks in `/lib/gluon/state/check.d/` and provides - a flag file for each check in `/var/gluon/state` depending on the return code - of the check. A flag file is created (or "touched") if the corresponding check - exits cleanly and gets removed otherwise. If the flags are "touched", they - are only accessed, but not modified. In this way, the atime of a flag file - reflects when the last check was performed and the mtime reflects when - when the state was last changed. + gluon-state-check executes checks in `/lib/gluon/state/check.d/` and provides + a flag file for each check in `/var/gluon/state` depending on the return code + of the check. A flag file is created (or "touched") if the corresponding check + exits cleanly and gets removed otherwise. If the flags are "touched", they + are only accessed, but not modified. In this way, the atime of a flag file + reflects when the last check was performed and the mtime reflects when + when the state was last changed. - This package provides the following checks: - - `has_default_gw6` - check whether the router has a default IPv6-route on br-client. + This package provides the following checks: + - `has_default_gw6` - check whether the router has a default IPv6-route on br-client. - The checks are executed once every minute (by micron.d). + The checks are executed once every minute (by micron.d). endef $(eval $(call BuildPackageGluon,gluon-state-check)) diff --git a/package/gluon-status-page-mesh-batman-adv/Makefile b/package/gluon-status-page-mesh-batman-adv/Makefile index 0fc8781f..54c0d104 100644 --- a/package/gluon-status-page-mesh-batman-adv/Makefile +++ b/package/gluon-status-page-mesh-batman-adv/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-status-page-mesh-batman-adv include ../gluon.mk define Package/gluon-status-page-mesh-batman-adv - TITLE:=Batman-data provider for gluon-status-page - DEPENDS:=+gluon-status-page gluon-mesh-batman-adv +libnl-tiny +libbatadv +libjson-c + TITLE:=Batman-data provider for gluon-status-page + DEPENDS:=+gluon-status-page gluon-mesh-batman-adv +libnl-tiny +libbatadv +libjson-c endef define Package/gluon-status-page-mesh-batman-adv/install diff --git a/package/gluon-status-page-mesh-batman-adv/src/Makefile b/package/gluon-status-page-mesh-batman-adv/src/Makefile index 5fb4ef4f..fe50d6b4 100644 --- a/package/gluon-status-page-mesh-batman-adv/src/Makefile +++ b/package/gluon-status-page-mesh-batman-adv/src/Makefile @@ -3,19 +3,19 @@ all: neighbours-batadv CFLAGS += -Wall -D_GNU_SOURCE ifeq ($(origin PKG_CONFIG), undefined) - PKG_CONFIG = pkg-config - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) - $(error $(PKG_CONFIG) not found) - endif + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif endif ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined) - LIBNL_NAME ?= libnl-tiny - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) - $(error No $(LIBNL_NAME) development libraries found!) - endif - LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) - LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) + LIBNL_NAME ?= libnl-tiny + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) + $(error No $(LIBNL_NAME) development libraries found!) + endif + LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) + LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) endif CFLAGS += $(LIBNL_CFLAGS) LDLIBS += $(LIBNL_LDLIBS) @@ -25,12 +25,12 @@ LDFLAGS_JSONC = $(shell pkg-config --libs json-c) ifeq ($(origin LIBBATADV_CFLAGS) $(origin LIBBATADV_LDLIBS), undefined undefined) - LIBBATADV_NAME ?= libbatadv - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) - $(error No $(LIBBATADV_NAME) development libraries found!) - endif - LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) - LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) + LIBBATADV_NAME ?= libbatadv + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBBATADV_NAME) 2>/dev/null),) + $(error No $(LIBBATADV_NAME) development libraries found!) + endif + LIBBATADV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBBATADV_NAME)) + LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME)) endif CFLAGS += $(LIBBATADV_CFLAGS) LDLIBS += $(LIBBATADV_LDLIBS) diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index 0b4bcb6d..f86ba01d 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-status-page include ../gluon.mk define Package/gluon-status-page - TITLE:=Status page showing information about the node - DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua + TITLE:=Status page showing information about the node + DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua endef PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY diff --git a/package/gluon-status-page/src/Makefile b/package/gluon-status-page/src/Makefile index a0a14e16..10a670c2 100644 --- a/package/gluon-status-page/src/Makefile +++ b/package/gluon-status-page/src/Makefile @@ -2,19 +2,19 @@ CFLAGS += -std=c99 -D_BSD_SOURCE CPPFLAGS += -D_GNU_SOURCE ifeq ($(origin PKG_CONFIG), undefined) - PKG_CONFIG = pkg-config - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) - $(error $(PKG_CONFIG) not found) - endif + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif endif ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined) - LIBNL_NAME ?= libnl-tiny - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) - $(error No $(LIBNL_NAME) development libraries found!) - endif - LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) - LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) + LIBNL_NAME ?= libnl-tiny + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) + $(error No $(LIBNL_NAME) development libraries found!) + endif + LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) + LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) endif CFLAGS_JSONC = $(shell pkg-config --cflags json-c) diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile index da42cf01..088cbc5c 100644 --- a/package/gluon-wan-dnsmasq/Makefile +++ b/package/gluon-wan-dnsmasq/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-wan-dnsmasq include ../gluon.mk define Package/gluon-wan-dnsmasq - TITLE:=Support for a secondary DNS server using the WAN interface - DEPENDS:=+gluon-core +libubus-lua +dnsmasq +libpacketmark + TITLE:=Support for a secondary DNS server using the WAN interface + DEPENDS:=+gluon-core +libubus-lua +dnsmasq +libpacketmark endef define Package/gluon-wan-dnsmasq/description diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile index aa26e8cd..48ce7e65 100644 --- a/package/gluon-web-admin/Makefile +++ b/package/gluon-web-admin/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-web-admin include ../gluon.mk define Package/gluon-web-admin - TITLE:=Web-based simple administration interface for mesh nodes - DEPENDS:=+gluon-config-mode-core +pretty-hostname + TITLE:=Web-based simple administration interface for mesh nodes + DEPENDS:=+gluon-config-mode-core +pretty-hostname endef $(eval $(call BuildPackageGluon,gluon-web-admin)) diff --git a/package/gluon-web-autoupdater/Makefile b/package/gluon-web-autoupdater/Makefile index 9b6a7d06..341831f2 100644 --- a/package/gluon-web-autoupdater/Makefile +++ b/package/gluon-web-autoupdater/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-web-autoupdater include ../gluon.mk define Package/gluon-web-autoupdater - TITLE:=gluon-web module for gluon-autoupdater - DEPENDS:=+gluon-web-admin +gluon-autoupdater + TITLE:=gluon-web module for gluon-autoupdater + DEPENDS:=+gluon-web-admin +gluon-autoupdater endef $(eval $(call BuildPackageGluon,gluon-web-autoupdater)) diff --git a/package/gluon-web-logging/Makefile b/package/gluon-web-logging/Makefile index 9463e1c1..4b91bcb8 100644 --- a/package/gluon-web-logging/Makefile +++ b/package/gluon-web-logging/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-logging include ../gluon.mk define Package/gluon-web-logging - DEPENDS:=+gluon-web-admin - TITLE:=UI for remote syslog configuration + DEPENDS:=+gluon-web-admin + TITLE:=UI for remote syslog configuration endef $(eval $(call BuildPackageGluon,gluon-web-logging)) diff --git a/package/gluon-web-mesh-vpn-fastd/Makefile b/package/gluon-web-mesh-vpn-fastd/Makefile index c7fdb6e1..ed36f5c3 100644 --- a/package/gluon-web-mesh-vpn-fastd/Makefile +++ b/package/gluon-web-mesh-vpn-fastd/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-mesh-vpn-fastd include ../gluon.mk define Package/gluon-web-mesh-vpn-fastd - TITLE:=gluon-web module to enable and disable encryption for the mesh VPN - DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd + TITLE:=gluon-web module to enable and disable encryption for the mesh VPN + DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd endef $(eval $(call BuildPackageGluon,gluon-web-mesh-vpn-fastd)) diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile index 9b1b0e7a..b555e116 100644 --- a/package/gluon-web-model/Makefile +++ b/package/gluon-web-model/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-model include ../gluon.mk define Package/gluon-web-model - TITLE:=Minimal Lua web framework derived from LuCI (model support) - DEPENDS:=+gluon-web + TITLE:=Minimal Lua web framework derived from LuCI (model support) + DEPENDS:=+gluon-web endef PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY diff --git a/package/gluon-web-network/Makefile b/package/gluon-web-network/Makefile index 17a83b85..c893f89c 100644 --- a/package/gluon-web-network/Makefile +++ b/package/gluon-web-network/Makefile @@ -8,8 +8,8 @@ PKG_NAME:=gluon-web-network include ../gluon.mk define Package/gluon-web-network - TITLE:=gluon-web module for network port configuration - DEPENDS:=+gluon-web-admin +gluon-client-bridge + TITLE:=gluon-web module for network port configuration + DEPENDS:=+gluon-web-admin +gluon-client-bridge endef $(eval $(call BuildPackageGluon,gluon-web-network)) diff --git a/package/gluon-web-node-role/Makefile b/package/gluon-web-node-role/Makefile index 516146bc..cb0eb09b 100644 --- a/package/gluon-web-node-role/Makefile +++ b/package/gluon-web-node-role/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-node-role include ../gluon.mk define Package/gluon-web-node-role - DEPENDS:=+gluon-web-admin +gluon-node-info - TITLE:=UI for specifying node role + DEPENDS:=+gluon-web-admin +gluon-node-info + TITLE:=UI for specifying node role endef $(eval $(call BuildPackageGluon,gluon-web-node-role)) diff --git a/package/gluon-web-osm/Makefile b/package/gluon-web-osm/Makefile index 31f4b7b7..ad45bbce 100644 --- a/package/gluon-web-osm/Makefile +++ b/package/gluon-web-osm/Makefile @@ -5,7 +5,7 @@ PKG_NAME:=gluon-web-osm include ../gluon.mk define Package/gluon-web-osm - TITLE:=base src for OSM inlay + TITLE:=base src for OSM inlay endef PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY diff --git a/package/gluon-web-private-wifi/Makefile b/package/gluon-web-private-wifi/Makefile index 971189cc..e4a6c1fd 100644 --- a/package/gluon-web-private-wifi/Makefile +++ b/package/gluon-web-private-wifi/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-private-wifi include ../gluon.mk define Package/gluon-web-private-wifi - DEPENDS:=+gluon-web-admin +gluon-private-wifi - TITLE:=UI for activating a private WLAN + DEPENDS:=+gluon-web-admin +gluon-private-wifi + TITLE:=UI for activating a private WLAN endef $(eval $(call BuildPackageGluon,gluon-web-private-wifi)) diff --git a/package/gluon-web-wifi-config/Makefile b/package/gluon-web-wifi-config/Makefile index e18febad..922f8c07 100644 --- a/package/gluon-web-wifi-config/Makefile +++ b/package/gluon-web-wifi-config/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-web-wifi-config include ../gluon.mk define Package/gluon-web-wifi-config - DEPENDS:=+gluon-web-admin +libiwinfo-lua - TITLE:=UI for Wifi Settings + DEPENDS:=+gluon-web-admin +libiwinfo-lua + TITLE:=UI for Wifi Settings endef $(eval $(call BuildPackageGluon,gluon-web-wifi-config)) diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile index 54460a48..ab1dc5a9 100644 --- a/package/gluon-web/Makefile +++ b/package/gluon-web/Makefile @@ -8,8 +8,8 @@ include ../gluon.mk include $(INCLUDE_DIR)/host-build.mk define Package/gluon-web - TITLE:=Minimal Lua web framework derived from LuCI - DEPENDS:=+lua-jsonc +luaposix + TITLE:=Minimal Lua web framework derived from LuCI + DEPENDS:=+lua-jsonc +luaposix endef define lang-config diff --git a/package/gluon-wireless-encryption/Makefile b/package/gluon-wireless-encryption/Makefile index 7edb82c1..eab7ade0 100644 --- a/package/gluon-wireless-encryption/Makefile +++ b/package/gluon-wireless-encryption/Makefile @@ -5,8 +5,8 @@ PKG_NAME:=gluon-wireless-encryption include ../gluon.mk define Package/gluon-wireless-encryption-wpa3 - DEPENDS:=+hostapd-wolfssl - TITLE:=Package for supporting WPA3 encrypted wireless networks + DEPENDS:=+hostapd-wolfssl + TITLE:=Package for supporting WPA3 encrypted wireless networks endef define Package/gluon-wireless-encryption-wpa3/install diff --git a/package/gluon.mk b/package/gluon.mk index df8e2637..a64d3462 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -6,11 +6,11 @@ PKG_VERSION ?= 1 PKG_BUILD_DEPENDS += luasrcdiet/host ifneq ($(wildcard ./luasrc/.),) - PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY + PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY endif ifneq ($(wildcard ./src/respondd.c),) - PKG_BUILD_DEPENDS += respondd + PKG_BUILD_DEPENDS += respondd endif include $(INCLUDE_DIR)/package.mk @@ -37,8 +37,8 @@ GLUON_I18N_CONFIG := $(foreach lang,$(GLUON_SUPPORTED_LANGS),CONFIG_GLUON_WEB_LA GLUON_ENABLED_LANGS := en $(foreach lang,$(GLUON_SUPPORTED_LANGS),$(if $(CONFIG_GLUON_WEB_LANG_$(lang)),$(lang))) ifneq ($(wildcard ./i18n/.),) - PKG_BUILD_DEPENDS += gluon-web/host - PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) + PKG_BUILD_DEPENDS += gluon-web/host + PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) endif @@ -64,7 +64,7 @@ endef define GluonSrcDiet rm -rf $(2) $(CP) $(1) $(2) - ifdef CONFIG_GLUON_MINIFY + ifdef CONFIG_GLUON_MINIFY # Use cp + rm instead of mv to preserve destination permissions set -e; $(FIND) $(2) -type f | while read src; do \ echo "Minifying $$$$src..."; \ @@ -72,7 +72,7 @@ define GluonSrcDiet cp "$$$$src.tmp" "$$$$src"; \ rm "$$$$src.tmp"; \ done - endif + endif endef @@ -110,20 +110,20 @@ endef Build/Compile=$(call Gluon/Build/Compile) define BuildPackageGluon - define Package/$(1) := - SECTION:=gluon - CATEGORY:=Gluon - $$(Package/$(1)) - endef + define Package/$(1) := + SECTION:=gluon + CATEGORY:=Gluon + $$(Package/$(1)) + endef - Package/$(1)/install ?= $$(Gluon/Build/Install) + Package/$(1)/install ?= $$(Gluon/Build/Install) - ifneq ($(wildcard check_site.lua),) - define Package/$(1)/postinst + ifneq ($(wildcard check_site.lua),) + define Package/$(1)/postinst #!/bin/sh $$(call GluonCheckSite,check_site.lua) - endef - endif + endef + endif - $$(eval $$(call BuildPackage,$(1))) + $$(eval $$(call BuildPackage,$(1))) endef diff --git a/package/libbatadv/Makefile b/package/libbatadv/Makefile index d2774769..af96b136 100644 --- a/package/libbatadv/Makefile +++ b/package/libbatadv/Makefile @@ -33,10 +33,10 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/libbatadv - SECTION:=libs - CATEGORY:=Libraries - TITLE:=batman-adv helpers functions - DEPENDS:=+libnl-tiny + SECTION:=libs + CATEGORY:=Libraries + TITLE:=batman-adv helpers functions + DEPENDS:=+libnl-tiny endef @@ -44,8 +44,8 @@ TARGET_CFLAGS += -flto -ffunction-sections -fdata-sections TARGET_LDFLAGS += -fuse-linker-plugin -Wl,--gc-sections MAKE_VARS += \ - LIBNL_NAME="libnl-tiny" \ - LIBNL_GENL_NAME="libnl-tiny" + LIBNL_NAME="libnl-tiny" \ + LIBNL_GENL_NAME="libnl-tiny" MAKE_ARGS += \ PREFIX=/usr diff --git a/package/libbatadv/src/Makefile b/package/libbatadv/src/Makefile index fabfa82f..15c787da 100644 --- a/package/libbatadv/src/Makefile +++ b/package/libbatadv/src/Makefile @@ -50,30 +50,30 @@ endif endif ifeq ($(origin PKG_CONFIG), undefined) - PKG_CONFIG = pkg-config - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) - $(error $(PKG_CONFIG) not found) - endif + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif endif ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined) - LIBNL_NAME ?= libnl-3.0 - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) - $(error No $(LIBNL_NAME) development libraries found!) - endif - LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) - LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) + LIBNL_NAME ?= libnl-3.0 + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),) + $(error No $(LIBNL_NAME) development libraries found!) + endif + LIBNL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_NAME)) + LIBNL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_NAME)) endif CFLAGS += $(LIBNL_CFLAGS) LDLIBS += $(LIBNL_LDLIBS) ifeq ($(origin LIBNL_GENL_CFLAGS) $(origin LIBNL_GENL_LDLIBS), undefined undefined) - LIBNL_GENL_NAME ?= libnl-genl-3.0 - ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_GENL_NAME) 2>/dev/null),) - $(error No $(LIBNL_GENL_NAME) development libraries found!) - endif - LIBNL_GENL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_GENL_NAME)) - LIBNL_GENL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_GENL_NAME)) + LIBNL_GENL_NAME ?= libnl-genl-3.0 + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_GENL_NAME) 2>/dev/null),) + $(error No $(LIBNL_GENL_NAME) development libraries found!) + endif + LIBNL_GENL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_GENL_NAME)) + LIBNL_GENL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_GENL_NAME)) endif CFLAGS += $(LIBNL_GENL_CFLAGS) LDLIBS += $(LIBNL_GENL_LDLIBS) diff --git a/package/libgluonutil/Makefile b/package/libgluonutil/Makefile index e9cc45cb..79b80040 100644 --- a/package/libgluonutil/Makefile +++ b/package/libgluonutil/Makefile @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk define Package/libgluonutil - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Gluon utility library - DEPENDS:=+libjson-c +libuci + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Gluon utility library + DEPENDS:=+libjson-c +libuci endef define Package/libgluonutil/install