treewide: automatically set SECTION and CATEGORY for Gluon packages

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

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

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

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

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

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

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

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

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

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

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

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

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 \

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

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

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 \

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

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 \

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

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

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

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 \

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

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

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

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

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

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

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

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

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))

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

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

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

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

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

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

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

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

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

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

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

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

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),)