From 994c94918a73a673f25a65fd6795fd89e19decec Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Sat, 14 Apr 2018 00:01:04 +0200 Subject: [PATCH] treewide: automatically set SECTION and CATEGORY for Gluon packages --- package/gluon-alfred/Makefile | 2 -- package/gluon-authorized-keys/Makefile | 2 -- package/gluon-autoupdater/Makefile | 2 -- package/gluon-client-bridge/Makefile | 2 -- package/gluon-config-mode-autoupdater/Makefile | 2 -- package/gluon-config-mode-contact-info/Makefile | 2 -- package/gluon-config-mode-core/Makefile | 2 -- package/gluon-config-mode-domain-select/Makefile | 2 -- package/gluon-config-mode-geo-location/Makefile | 2 -- package/gluon-config-mode-hostname/Makefile | 2 -- package/gluon-config-mode-mesh-vpn/Makefile | 2 -- package/gluon-config-mode-theme/Makefile | 2 -- package/gluon-core/Makefile | 2 -- package/gluon-ebtables-filter-multicast/Makefile | 2 -- package/gluon-ebtables-filter-ra-dhcp/Makefile | 2 -- package/gluon-ebtables-limit-arp/Makefile | 2 -- package/gluon-ebtables-source-filter/Makefile | 2 -- package/gluon-ebtables/Makefile | 2 -- package/gluon-l3roamd/Makefile | 2 -- package/gluon-lock-password/Makefile | 2 -- package/gluon-mesh-batman-adv/Makefile | 2 -- package/gluon-mesh-vpn-core/Makefile | 2 -- package/gluon-mesh-vpn-fastd/Makefile | 2 -- package/gluon-mesh-vpn-tunneldigger/Makefile | 2 -- package/gluon-neighbour-info/Makefile | 2 -- package/gluon-node-info/Makefile | 2 -- package/gluon-radv-filterd/Makefile | 2 -- package/gluon-radvd/Makefile | 2 -- package/gluon-respondd/Makefile | 2 -- package/gluon-setup-mode/Makefile | 2 -- package/gluon-site/Makefile | 4 +--- package/gluon-status-page/Makefile | 2 -- package/gluon-wan-dnsmasq/Makefile | 2 -- package/gluon-web-admin/Makefile | 2 -- package/gluon-web-autoupdater/Makefile | 2 -- package/gluon-web-logging/Makefile | 2 -- package/gluon-web-mesh-vpn-fastd/Makefile | 2 -- package/gluon-web-model/Makefile | 2 -- package/gluon-web-network/Makefile | 2 -- package/gluon-web-node-role/Makefile | 2 -- package/gluon-web-private-wifi/Makefile | 2 -- package/gluon-web-wifi-config/Makefile | 2 -- package/gluon-web/Makefile | 2 -- package/gluon.mk | 6 ++++++ 44 files changed, 7 insertions(+), 87 deletions(-) diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile index 23a8f242c..7c173a773 100644 --- a/package/gluon-alfred/Makefile +++ b/package/gluon-alfred/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-alfred - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +alfred TITLE:=Configure alfred endef diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile index d6fcb0e43..2995107a7 100644 --- a/package/gluon-authorized-keys/Makefile +++ b/package/gluon-authorized-keys/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=2 include ../gluon.mk define Package/gluon-authorized-keys - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Fill /etc/dropbear/authorized_keys from site.conf DEPENDS:=+gluon-core endef diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index b0314afec..d6e874998 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -8,8 +8,6 @@ PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH include ../gluon.mk define Package/gluon-autoupdater - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-core +libgluonutil +micrond +autoupdater TITLE:=Automatically update firmware endef diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile index 19a0e3a4c..a2daf34b4 100644 --- a/package/gluon-client-bridge/Makefile +++ b/package/gluon-client-bridge/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-client-bridge - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Provides a bridge and a wireless interface for clients to connect to DEPENDS:=+gluon-core +kmod-veth +@GLUON_SPECIALIZE_KERNEL:KERNEL_VETH endef diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index d6a97f27b..b94d3b450 100644 --- a/package/gluon-config-mode-autoupdater/Makefile +++ b/package/gluon-config-mode-autoupdater/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-autoupdater - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not DEPENDS:=+gluon-config-mode-core +gluon-autoupdater endef diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index 5b84b1a53..fba53c4d6 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-contact-info - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Allows the user to provide contact information to be distributed in the mesh DEPENDS:=+gluon-config-mode-core +gluon-node-info endef diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 21976dc6f..b9c394871 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -9,8 +9,6 @@ PKG_VERSION:=2 include ../gluon.mk define Package/gluon-config-mode-core - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Configuration wizard for user friendly setup of new mesh nodes DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd endef diff --git a/package/gluon-config-mode-domain-select/Makefile b/package/gluon-config-mode-domain-select/Makefile index 410ac964d..b1ded9391 100644 --- a/package/gluon-config-mode-domain-select/Makefile +++ b/package/gluon-config-mode-domain-select/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-domain-select - SECTION:=gluon - CATEGORY:=Gluon TITLE:=UI for changing the node-config DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN endef diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index e1482de9b..a020feb91 100644 --- a/package/gluon-config-mode-geo-location/Makefile +++ b/package/gluon-config-mode-geo-location/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-geo-location - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Set geographic location of a node DEPENDS:=+gluon-config-mode-core +gluon-node-info endef diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index f4dfd7e87..fdf3acd9b 100644 --- a/package/gluon-config-mode-hostname/Makefile +++ b/package/gluon-config-mode-hostname/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-hostname - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Set the hostname DEPENDS:=+gluon-config-mode-core endef diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index 549dbdbdd..0c3a752df 100644 --- a/package/gluon-config-mode-mesh-vpn/Makefile +++ b/package/gluon-config-mode-mesh-vpn/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=2 include ../gluon.mk define Package/gluon-config-mode-mesh-vpn - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Toggle mesh-vpn and bandwidth limit DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core endef diff --git a/package/gluon-config-mode-theme/Makefile b/package/gluon-config-mode-theme/Makefile index 34e2a0d40..38858f0cd 100644 --- a/package/gluon-config-mode-theme/Makefile +++ b/package/gluon-config-mode-theme/Makefile @@ -9,8 +9,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-config-mode-theme - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Gluon config mode theme for gluon-web DEPENDS:=+gluon-core +gluon-web endef diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index f220b9f46..c0600c1f5 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -11,8 +11,6 @@ include ../gluon.mk include $(INCLUDE_DIR)/cmake.mk define Package/gluon-core - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Base files of Gluon DEPENDS:= \ +gluon-site +libgluonutil +libiwinfo-lua +lua-platform-info +lua-simple-uci +lua-hash +lua-jsonc \ diff --git a/package/gluon-ebtables-filter-multicast/Makefile b/package/gluon-ebtables-filter-multicast/Makefile index 1b500fd56..dc579a2a8 100644 --- a/package/gluon-ebtables-filter-multicast/Makefile +++ b/package/gluon-ebtables-filter-multicast/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-ebtables-filter-multicast - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Ebtables filters for multicast packets DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef diff --git a/package/gluon-ebtables-filter-ra-dhcp/Makefile b/package/gluon-ebtables-filter-ra-dhcp/Makefile index 30f5238a0..c650bb896 100644 --- a/package/gluon-ebtables-filter-ra-dhcp/Makefile +++ b/package/gluon-ebtables-filter-ra-dhcp/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-ebtables-filter-ra-dhcp - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Ebtables filters for Router Advertisement and DHCP packets DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile index a356b832b..f7bdc48d0 100644 --- a/package/gluon-ebtables-limit-arp/Makefile +++ b/package/gluon-ebtables-limit-arp/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-ebtables-limit-arp - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Ebtables limiter for ARP packets DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_LIMIT \ diff --git a/package/gluon-ebtables-source-filter/Makefile b/package/gluon-ebtables-source-filter/Makefile index d19b047ba..2c14a7932 100644 --- a/package/gluon-ebtables-source-filter/Makefile +++ b/package/gluon-ebtables-source-filter/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-ebtables-source-filter - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Ebtables rules to filter unreasonable L2 traffic. DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef diff --git a/package/gluon-ebtables/Makefile b/package/gluon-ebtables/Makefile index 3a2fffdc7..ca83fcf48 100644 --- a/package/gluon-ebtables/Makefile +++ b/package/gluon-ebtables/Makefile @@ -9,8 +9,6 @@ PKG_CONFIG_DEPENDS := CONFIG_GLUON_SPECIALIZE_KERNEL include ../gluon.mk define Package/gluon-ebtables - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Ebtables support DEPENDS:=+gluon-core +ebtables-tiny \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_T_FILTER \ diff --git a/package/gluon-l3roamd/Makefile b/package/gluon-l3roamd/Makefile index 048833874..9cae9bb12 100644 --- a/package/gluon-l3roamd/Makefile +++ b/package/gluon-l3roamd/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-l3roamd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Configure l3roamd for babel DEPENDS:=+gluon-core +l3roamd endef diff --git a/package/gluon-lock-password/Makefile b/package/gluon-lock-password/Makefile index f62820066..366fd7b80 100644 --- a/package/gluon-lock-password/Makefile +++ b/package/gluon-lock-password/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-lock-password - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Locks the root account by default DEPENDS:=+gluon-core endef diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index a8c4801dd..4b158f5a1 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-mesh-batman-adv/common - SECTION:=gluon - CATEGORY:=Gluon PROVIDES:=gluon-mesh-batman-adv DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C endef diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile index 885905738..f161333f6 100644 --- a/package/gluon-mesh-vpn-core/Makefile +++ b/package/gluon-mesh-vpn-core/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-mesh-vpn-core - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Basic support for connecting meshes via VPN tunnels DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables +iptables-mod-extra +simple-tc \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_NETFILTER_XT_MATCH_ADDRTYPE \ diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index 477cd48e8..087aff5f8 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=3 include ../gluon.mk define Package/gluon-mesh-vpn-fastd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Support for connecting meshes via fastd DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd +@GLUON_SPECIALIZE_KERNEL:KERNEL_TUN endef diff --git a/package/gluon-mesh-vpn-tunneldigger/Makefile b/package/gluon-mesh-vpn-tunneldigger/Makefile index d463db414..a5c23c258 100644 --- a/package/gluon-mesh-vpn-tunneldigger/Makefile +++ b/package/gluon-mesh-vpn-tunneldigger/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=3 include ../gluon.mk define Package/gluon-mesh-vpn-tunneldigger - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Support for connecting meshes via tunneltigger/L2TPv3 pseudowire DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger +@GLUON_SPECIALIZE_KERNEL:KERNEL_L2TP endef diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile index 37bd4a495..af58036c4 100644 --- a/package/gluon-neighbour-info/Makefile +++ b/package/gluon-neighbour-info/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-neighbour-info - SECTION:=gluon - CATEGORY:=Gluon TITLE:=neighbour-info DEPENDS:= endef diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile index 037c2e66a..7718fa2b7 100644 --- a/package/gluon-node-info/Makefile +++ b/package/gluon-node-info/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-node-info - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Add /etc/config/gluon-node-info to uci DEPENDS:=+gluon-core +libgluonutil endef diff --git a/package/gluon-radv-filterd/Makefile b/package/gluon-radv-filterd/Makefile index 23485130f..28d778c17 100644 --- a/package/gluon-radv-filterd/Makefile +++ b/package/gluon-radv-filterd/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-radv-filterd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Filter IPv6 router advertisements DEPENDS:=+gluon-ebtables +libgluonutil +libbatadv +libnl-tiny endef diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index 7bcdaafd2..a3957530e 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=3 include ../gluon.mk define Package/gluon-radvd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Advertise an IPv6 prefix from the node DEPENDS:=+gluon-core +uradvd endef diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile index 9dc3f0f3a..52839a864 100644 --- a/package/gluon-respondd/Makefile +++ b/package/gluon-respondd/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-respondd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Provides node information to the network DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd endef diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index 6e11f420d..ff1c730b3 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -9,8 +9,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-setup-mode - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Setup mode DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq endef diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile index 5b7a69687..914522647 100644 --- a/package/gluon-site/Makefile +++ b/package/gluon-site/Makefile @@ -17,8 +17,6 @@ include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) define Package/gluon-site - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Site-specific files of Gluon endef @@ -75,4 +73,4 @@ define Package/gluon-site/install $(GluonInstallI18N) endef -$(eval $(call BuildPackage,gluon-site)) +$(eval $(call BuildPackageGluon,gluon-site)) diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index 7401f0990..d17ce2dae 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=3 include ../gluon.mk define Package/gluon-status-page - SECTION:=gluon - CATEGORY:=Gluon 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 +libbatadv endef diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile index 75be1b539..adbe0f788 100644 --- a/package/gluon-wan-dnsmasq/Makefile +++ b/package/gluon-wan-dnsmasq/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-wan-dnsmasq - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Support for a secondary DNS server using the WAN interface DEPENDS:=+gluon-core +libubus-lua +dnsmasq +libpacketmark endef diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile index 881db831a..d555be615 100644 --- a/package/gluon-web-admin/Makefile +++ b/package/gluon-web-admin/Makefile @@ -10,8 +10,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-admin - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Web-based simple administration interface for mesh nodes DEPENDS:=+gluon-config-mode-core +pretty-hostname endef diff --git a/package/gluon-web-autoupdater/Makefile b/package/gluon-web-autoupdater/Makefile index daa7508f3..c50e731a0 100644 --- a/package/gluon-web-autoupdater/Makefile +++ b/package/gluon-web-autoupdater/Makefile @@ -10,8 +10,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-autoupdater - SECTION:=gluon - CATEGORY:=Gluon TITLE:=gluon-web module for gluon-autoupdater DEPENDS:=+gluon-web-admin +gluon-autoupdater endef diff --git a/package/gluon-web-logging/Makefile b/package/gluon-web-logging/Makefile index 4cd1076cb..10d83740d 100644 --- a/package/gluon-web-logging/Makefile +++ b/package/gluon-web-logging/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-logging - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-web-admin TITLE:=UI for remote syslog configuration endef diff --git a/package/gluon-web-mesh-vpn-fastd/Makefile b/package/gluon-web-mesh-vpn-fastd/Makefile index da13d43d6..46dfd1817 100644 --- a/package/gluon-web-mesh-vpn-fastd/Makefile +++ b/package/gluon-web-mesh-vpn-fastd/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-mesh-vpn-fastd - SECTION:=gluon - CATEGORY:=Gluon TITLE:=gluon-web module to enable and disable encryption for the mesh VPN DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd endef diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile index e2badbd42..d767f562b 100644 --- a/package/gluon-web-model/Makefile +++ b/package/gluon-web-model/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-web-model - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Minimal Lua web framework derived from LuCI (model support) DEPENDS:=+gluon-web endef diff --git a/package/gluon-web-network/Makefile b/package/gluon-web-network/Makefile index a7c14254a..42620fe54 100644 --- a/package/gluon-web-network/Makefile +++ b/package/gluon-web-network/Makefile @@ -10,8 +10,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-network - SECTION:=gluon - CATEGORY:=Gluon TITLE:=gluon-web module for network port configuration DEPENDS:=+gluon-web-admin +gluon-client-bridge endef diff --git a/package/gluon-web-node-role/Makefile b/package/gluon-web-node-role/Makefile index 099b9c413..812837613 100644 --- a/package/gluon-web-node-role/Makefile +++ b/package/gluon-web-node-role/Makefile @@ -6,8 +6,6 @@ PKG_VERSION:=1 include ../gluon.mk define Package/gluon-web-node-role - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-web-admin +gluon-node-info TITLE:=UI for specifying node role endef diff --git a/package/gluon-web-private-wifi/Makefile b/package/gluon-web-private-wifi/Makefile index 313c0ce42..cff13fcb3 100644 --- a/package/gluon-web-private-wifi/Makefile +++ b/package/gluon-web-private-wifi/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-private-wifi - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-web-admin TITLE:=UI for activating a private WLAN endef diff --git a/package/gluon-web-wifi-config/Makefile b/package/gluon-web-wifi-config/Makefile index 398bf42e4..7827491e7 100644 --- a/package/gluon-web-wifi-config/Makefile +++ b/package/gluon-web-wifi-config/Makefile @@ -7,8 +7,6 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-web-wifi-config - SECTION:=gluon - CATEGORY:=Gluon DEPENDS:=+gluon-web-admin +libiwinfo-lua TITLE:=UI for Wifi Settings endef diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile index 796ed3617..1ecca59ea 100644 --- a/package/gluon-web/Makefile +++ b/package/gluon-web/Makefile @@ -8,8 +8,6 @@ PKG_INSTALL:=1 include ../gluon.mk define Package/gluon-web - SECTION:=gluon - CATEGORY:=Gluon TITLE:=Minimal Lua web framework derived from LuCI DEPENDS:=+lua-jsonc +luci-lib-nixio endef diff --git a/package/gluon.mk b/package/gluon.mk index ea9658ad9..0b9787fcb 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -100,6 +100,12 @@ endef Build/Compile=$(call Gluon/Build/Compile) define BuildPackageGluon + define Package/$(1) := + SECTION:=gluon + CATEGORY:=Gluon + $$(Package/$(1)) + endef + Package/$(1)/install ?= $$(Gluon/Build/Install) ifneq ($(wildcard check_site.lua),) -- GitLab