treewide: move package Makefile boilerplate to gluon.mk

package/gluon-mesh-batman-adv/Makefile

@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-mesh-batman-adv
 PKG_VERSION:=1
 
-PKG_BUILD_DEPENDS := respondd
-
 include ../gluon.mk
 
 define Package/gluon-mesh-batman-adv/common
@@ -27,37 +25,19 @@ $(Package/gluon-mesh-batman-adv/common)
   DEPENDS+=+kmod-batman-adv +batctl
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-mesh-batman-adv/common/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-batman-adv.so
+define Package/gluon-mesh-batman-adv-14/install
+	$(Gluon/Build/Install)
 
 	$(INSTALL_DIR) $(1)/lib/gluon/mesh-batman-adv
-endef
-
-define Package/gluon-mesh-batman-adv-14/install
-$(Package/gluon-mesh-batman-adv/common/install)
 	echo 14 > $(1)/lib/gluon/mesh-batman-adv/compat
 endef
 
 define Package/gluon-mesh-batman-adv-15/install
-$(Package/gluon-mesh-batman-adv/common/install)
-	echo 15 > $(1)/lib/gluon/mesh-batman-adv/compat
-endef
+	$(Gluon/Build/Install)
 
-define Package/gluon-mesh-batman-adv/common/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
+	$(INSTALL_DIR) $(1)/lib/gluon/mesh-batman-adv
+	echo 15 > $(1)/lib/gluon/mesh-batman-adv/compat
 endef
-Package/gluon-mesh-batman-adv-14/postinst := $(Package/gluon-mesh-batman-adv/common/postinst)
-Package/gluon-mesh-batman-adv-15/postinst := $(Package/gluon-mesh-batman-adv/common/postinst)
-
 
-$(eval $(call BuildPackage,gluon-mesh-batman-adv-14))
-$(eval $(call BuildPackage,gluon-mesh-batman-adv-15))
+$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-14))
+$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-15))

package/gluon-mesh-vpn-core/Makefile

@@ -13,18 +13,4 @@ define Package/gluon-mesh-vpn-core
   USERID:=:gluon-mesh-vpn=800
 endef
 
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-mesh-vpn-core/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-define Package/gluon-mesh-vpn-core/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-mesh-vpn-core))
+$(eval $(call BuildPackageGluon,gluon-mesh-vpn-core))

package/gluon-mesh-vpn-fastd/Makefile

@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-mesh-vpn-fastd
 PKG_VERSION:=3
 
-PKG_BUILD_DEPENDS := respondd
-
 include ../gluon.mk
 
 define Package/gluon-mesh-vpn-fastd
@@ -14,21 +12,4 @@ define Package/gluon-mesh-vpn-fastd
   DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-mesh-vpn-fastd/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-vpn-fastd.so
-endef
-
-define Package/gluon-mesh-vpn-fastd/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-mesh-vpn-fastd))
+$(eval $(call BuildPackageGluon,gluon-mesh-vpn-fastd))

package/gluon-mesh-vpn-tunneldigger/Makefile

@@ -12,18 +12,4 @@ define Package/gluon-mesh-vpn-tunneldigger
   DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger
 endef
 
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-mesh-vpn-tunneldigger/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-define Package/gluon-mesh-vpn-tunneldigger/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-mesh-vpn-tunneldigger))
+$(eval $(call BuildPackageGluon,gluon-mesh-vpn-tunneldigger))

package/gluon-neighbour-info/Makefile

@@ -4,6 +4,8 @@ PKG_NAME:=gluon-neighbour-info
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
+GLUON_PKG_MAKE:=1
+
 include ../gluon.mk
 
 define Package/gluon-neighbour-info
@@ -17,15 +19,11 @@ define Package/gluon-neighbour-info/description
 	Gluon community wifi mesh firmware framework: neighbour-info
 endef
 
-define Build/Compile
-	$(Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
 define Package/gluon-neighbour-info/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
+	$(Gluon/Build/Install)
+
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gluon-neighbour-info $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,gluon-neighbour-info))
+$(eval $(call BuildPackageGluon,gluon-neighbour-info))

package/gluon-node-info/Makefile

@@ -4,11 +4,8 @@ PKG_NAME:=gluon-node-info
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-PKG_BUILD_DEPENDS := respondd
-
 include ../gluon.mk
 
-
 define Package/gluon-node-info
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -16,21 +13,4 @@ define Package/gluon-node-info
   DEPENDS:=+gluon-core +libgluonutil
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-node-info/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/node-info.so
-endef
-
-define Package/gluon-node-info/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-node-info))
+$(eval $(call BuildPackageGluon,gluon-node-info))

package/gluon-radv-filterd/Makefile

@@ -4,8 +4,6 @@ PKG_NAME:=gluon-radv-filterd
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-PKG_BUILD_DEPENDS := respondd
-
 include ../gluon.mk
 
 define Package/gluon-radv-filterd
@@ -20,18 +18,10 @@ MAKE_VARS += \
         LIBNL_GENL_NAME="libnl-tiny"
 
 define Package/gluon-radv-filterd/install
-	$(CP) ./files/* $(1)/
+	$(Gluon/Build/Install)
 
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gluon-radv-filterd $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/radv-filterd.so
-endef
-
-define Package/gluon-radv-filterd/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
 endef
 
-$(eval $(call BuildPackage,gluon-radv-filterd))
+$(eval $(call BuildPackageGluon,gluon-radv-filterd))

package/gluon-radvd/Makefile

@@ -16,13 +16,4 @@ define Package/gluon-radvd/description
 	Gluon community wifi mesh firmware framework: Advertise an IPv6 prefix from the node
 endef
 
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-radvd/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-radvd))
+$(eval $(call BuildPackageGluon,gluon-radvd))

package/gluon-respondd/Makefile

@@ -12,16 +12,4 @@ define Package/gluon-respondd
   DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-respondd/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/respondd.so
-endef
-
-$(eval $(call BuildPackage,gluon-respondd))
+$(eval $(call BuildPackageGluon,gluon-respondd))

package/gluon-setup-mode/Makefile

@@ -19,18 +19,4 @@ define Package/gluon-setup-mode/description
 	Offline mode to perform basic setup in a secure manner.
 endef
 
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-setup-mode/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-define Package/gluon-setup-mode/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-setup-mode))
+$(eval $(call BuildPackageGluon,gluon-setup-mode))

package/gluon-site/Makefile

@@ -58,7 +58,7 @@ define Build/Compile
 	)
   endif
 
-	$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n)
+	$(call GluonBuildI18N,$(GLUON_SITEDIR)/i18n)
 endef
 
 define Package/gluon-site/install
@@ -72,7 +72,7 @@ define Package/gluon-site/install
 	echo '$(GLUON_SITE_VERSION)' > $(1)/lib/gluon/site-version
 	echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release
 
-	$(call GluonInstallI18N,gluon-site,$(1))
+	$(GluonInstallI18N)
 endef
 
 $(eval $(call BuildPackage,gluon-site))

package/gluon-status-page/Makefile

@@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-status-page
 PKG_VERSION:=3
 
-include ../gluon.mk
+GLUON_PKG_MAKE:=1
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
+include ../gluon.mk
 
 define Package/gluon-status-page
   SECTION:=gluon
@@ -14,24 +14,15 @@ define Package/gluon-status-page
   DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua +libbatadv
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-	$(call GluonBuildI18N,gluon-status-page,i18n)
-endef
-
 define Package/gluon-status-page/install
+	$(Gluon/Build/Install)
+
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/{neighbours-batadv,stations} $(1)/lib/gluon/status-page/providers/
 
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/view/
 	$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/status-page/
 	$(LN) /lib/gluon/web/view/error $(1)/lib/gluon/status-page/view/
-
-	$(call GluonInstallI18N,gluon-status-page,$(1))
 endef
 
-$(eval $(call BuildPackage,gluon-status-page))
+$(eval $(call BuildPackageGluon,gluon-status-page))

package/gluon-wan-dnsmasq/Makefile

@@ -16,13 +16,4 @@ define Package/gluon-wan-dnsmasq/description
 	Gluon community wifi mesh firmware framework: Support for a secondary DNS server using the WAN interface
 endef
 
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-wan-dnsmasq/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-wan-dnsmasq))
+$(eval $(call BuildPackageGluon,gluon-wan-dnsmasq))

package/gluon-web-admin/Makefile

@@ -9,8 +9,6 @@ PKG_RELEASE:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-admin
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -18,20 +16,4 @@ define Package/gluon-web-admin
   DEPENDS:=+gluon-config-mode-core +pretty-hostname
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-admin,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-admin/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-admin,$(1))
-endef
-
-define Package/gluon-web-admin/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-web-admin))
+$(eval $(call BuildPackageGluon,gluon-web-admin))

package/gluon-web-autoupdater/Makefile

@@ -9,8 +9,6 @@ PKG_RELEASE:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -18,14 +16,4 @@ define Package/gluon-web-autoupdater
   DEPENDS:=+gluon-web-admin +gluon-autoupdater
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-autoupdater,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-autoupdater/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-autoupdater,$(1))
-endef
-
-$(eval $(call BuildPackage,gluon-web-autoupdater))
+$(eval $(call BuildPackageGluon,gluon-web-autoupdater))

package/gluon-web-logging/Makefile

@@ -6,8 +6,6 @@ PKG_RELEASE:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-logging
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -15,14 +13,4 @@ define Package/gluon-web-logging
   TITLE:=UI for remote syslog configuration
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-logging,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-logging/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-logging,$(1))
-endef
-
-$(eval $(call BuildPackage,gluon-web-logging))
+$(eval $(call BuildPackageGluon,gluon-web-logging))

package/gluon-web-mesh-vpn-fastd/Makefile

@@ -6,8 +6,6 @@ PKG_RELEASE:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-mesh-vpn-fastd
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -15,20 +13,4 @@ define Package/gluon-web-mesh-vpn-fastd
   DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-mesh-vpn-fastd,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-mesh-vpn-fastd/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-mesh-vpn-fastd,$(1))
-endef
-
-define Package/gluon-web-mesh-vpn-fastd/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-web-mesh-vpn-fastd))
+$(eval $(call BuildPackageGluon,gluon-web-mesh-vpn-fastd))

package/gluon-web-model/Makefile

@@ -12,16 +12,4 @@ define Package/gluon-web-model
   DEPENDS:=+gluon-web
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-model,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-model/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-model,$(1))
-
-endef
-
-$(eval $(call BuildPackage,gluon-web-model))
+$(eval $(call BuildPackageGluon,gluon-web-model))

package/gluon-web-network/Makefile

@@ -9,8 +9,6 @@ PKG_RELEASE:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-network
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -18,14 +16,4 @@ define Package/gluon-web-network
   DEPENDS:=+gluon-web-admin +gluon-client-bridge
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-network,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-network/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-network,$(1))
-endef
-
-$(eval $(call BuildPackage,gluon-web-network))
+$(eval $(call BuildPackageGluon,gluon-web-network))

package/gluon-web-node-role/Makefile

@@ -5,8 +5,6 @@ PKG_VERSION:=1
 
 include ../gluon.mk
 
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-web-node-role
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -14,19 +12,4 @@ define Package/gluon-web-node-role
   TITLE:=UI for specifying node role
 endef
 
-define Build/Compile
-	$(call GluonBuildI18N,gluon-web-node-role,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-web-node-role/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-web-node-role,$(1))
-endef
-
-define Package/gluon-web-node-role/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-web-node-role))
+$(eval $(call BuildPackageGluon,gluon-web-node-role))