Skip to content
Snippets Groups Projects
Unverified Commit 60522ee2 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

treewide: move package Makefile boilerplate to gluon.mk

parent ee14a03e
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 248 deletions
...@@ -13,13 +13,4 @@ define Package/gluon-alfred ...@@ -13,13 +13,4 @@ define Package/gluon-alfred
TITLE:=Configure alfred TITLE:=Configure alfred
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-alfred))
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-alfred/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
$(eval $(call BuildPackage,gluon-alfred))
...@@ -12,17 +12,4 @@ define Package/gluon-authorized-keys ...@@ -12,17 +12,4 @@ define Package/gluon-authorized-keys
DEPENDS:=+gluon-core DEPENDS:=+gluon-core
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-authorized-keys))
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-authorized-keys/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
define Package/gluon-authorized-keys/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-authorized-keys))
...@@ -4,7 +4,6 @@ PKG_NAME:=gluon-autoupdater ...@@ -4,7 +4,6 @@ PKG_NAME:=gluon-autoupdater
PKG_VERSION:=4 PKG_VERSION:=4
PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk include ../gluon.mk
...@@ -22,17 +21,8 @@ config GLUON_BRANCH ...@@ -22,17 +21,8 @@ config GLUON_BRANCH
default "" default ""
endef endef
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-autoupdater/install define Package/gluon-autoupdater/install
$(CP) ./files/* $(1)/ $(Gluon/Build/Install)
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/autoupdater.so
ifneq ($(CONFIG_GLUON_BRANCH),"") ifneq ($(CONFIG_GLUON_BRANCH),"")
$(INSTALL_DIR) $(1)/lib/gluon/autoupdater $(INSTALL_DIR) $(1)/lib/gluon/autoupdater
...@@ -40,9 +30,4 @@ ifneq ($(CONFIG_GLUON_BRANCH),"") ...@@ -40,9 +30,4 @@ ifneq ($(CONFIG_GLUON_BRANCH),"")
endif endif
endef endef
define Package/gluon-autoupdater/postinst $(eval $(call BuildPackageGluon,gluon-autoupdater))
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-autoupdater))
...@@ -12,17 +12,4 @@ define Package/gluon-client-bridge ...@@ -12,17 +12,4 @@ define Package/gluon-client-bridge
DEPENDS:=+gluon-core +kmod-veth DEPENDS:=+gluon-core +kmod-veth
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-client-bridge))
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-client-bridge/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
define Package/gluon-client-bridge/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-client-bridge))
...@@ -5,8 +5,6 @@ PKG_VERSION:=1 ...@@ -5,8 +5,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-autoupdater define Package/gluon-config-mode-autoupdater
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-autoupdater ...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-autoupdater
DEPENDS:=+gluon-config-mode-core +gluon-autoupdater DEPENDS:=+gluon-config-mode-core +gluon-autoupdater
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-autoupdater))
$(call GluonBuildI18N,gluon-config-mode-autoupdater,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-autoupdater/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-autoupdater,$(1))
endef
$(eval $(call BuildPackage,gluon-config-mode-autoupdater))
...@@ -5,8 +5,6 @@ PKG_VERSION:=1 ...@@ -5,8 +5,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-contact-info define Package/gluon-config-mode-contact-info
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -19,19 +17,4 @@ define Package/gluon-config-mode-contact-info/description ...@@ -19,19 +17,4 @@ define Package/gluon-config-mode-contact-info/description
Can be made obligatory in site.conf Can be made obligatory in site.conf
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-contact-info))
$(call GluonBuildI18N,gluon-config-mode-contact-info,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-contact-info/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-contact-info,$(1))
endef
define Package/gluon-config-mode-contact-info/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-config-mode-contact-info))
...@@ -8,8 +8,6 @@ PKG_VERSION:=2 ...@@ -8,8 +8,6 @@ PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-core define Package/gluon-config-mode-core
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -17,21 +15,13 @@ define Package/gluon-config-mode-core ...@@ -17,21 +15,13 @@ define Package/gluon-config-mode-core
DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd
endef endef
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-core,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-core/install define Package/gluon-config-mode-core/install
$(CP) ./files/* $(1)/ $(Gluon/Build/Install)
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/ $(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/ $(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/ $(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/ $(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
$(call GluonInstallI18N,gluon-config-mode-core,$(1))
endef endef
$(eval $(call BuildPackage,gluon-config-mode-core)) $(eval $(call BuildPackageGluon,gluon-config-mode-core))
...@@ -12,17 +12,4 @@ define Package/gluon-config-mode-domain-select ...@@ -12,17 +12,4 @@ define Package/gluon-config-mode-domain-select
DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-domain-select))
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-domain-select/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
define Package/gluon-config-domain-select/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-config-mode-domain-select))
...@@ -5,8 +5,6 @@ PKG_VERSION:=1 ...@@ -5,8 +5,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-geo-location define Package/gluon-config-mode-geo-location
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -14,19 +12,4 @@ define Package/gluon-config-mode-geo-location ...@@ -14,19 +12,4 @@ define Package/gluon-config-mode-geo-location
DEPENDS:=+gluon-config-mode-core +gluon-node-info DEPENDS:=+gluon-config-mode-core +gluon-node-info
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-geo-location))
$(call GluonBuildI18N,gluon-config-mode-geo-location,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-geo-location/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-geo-location,$(1))
endef
define Package/gluon-config-mode-geo-location/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-config-mode-geo-location))
...@@ -5,8 +5,6 @@ PKG_VERSION:=1 ...@@ -5,8 +5,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-hostname define Package/gluon-config-mode-hostname
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-hostname ...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-hostname
DEPENDS:=+gluon-config-mode-core DEPENDS:=+gluon-config-mode-core
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-hostname))
$(call GluonBuildI18N,gluon-config-mode-hostname,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-hostname/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-hostname,$(1))
endef
$(eval $(call BuildPackage,gluon-config-mode-hostname))
...@@ -5,8 +5,6 @@ PKG_VERSION:=2 ...@@ -5,8 +5,6 @@ PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-mesh-vpn define Package/gluon-config-mode-mesh-vpn
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-mesh-vpn ...@@ -14,14 +12,4 @@ define Package/gluon-config-mode-mesh-vpn
DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-mesh-vpn))
$(call GluonBuildI18N,gluon-config-mode-mesh-vpn,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-config-mode-mesh-vpn/install
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-mesh-vpn,$(1))
endef
$(eval $(call BuildPackage,gluon-config-mode-mesh-vpn))
...@@ -8,8 +8,6 @@ PKG_VERSION:=1 ...@@ -8,8 +8,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-config-mode-theme define Package/gluon-config-mode-theme
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
...@@ -17,13 +15,4 @@ define Package/gluon-config-mode-theme ...@@ -17,13 +15,4 @@ define Package/gluon-config-mode-theme
DEPENDS:=+gluon-core +gluon-web DEPENDS:=+gluon-core +gluon-web
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-config-mode-theme))
$(call GluonBuildI18N,gluon-config-mode-theme,i18n)
endef
define Package/gluon-config-mode-theme/install
$(CP) ./files/* $(1)/
$(call GluonInstallI18N,gluon-config-mode-theme,$(1))
endef
$(eval $(call BuildPackage,gluon-config-mode-theme))
...@@ -7,6 +7,8 @@ PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION)) ...@@ -7,6 +7,8 @@ PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
...@@ -23,23 +25,11 @@ define Package/gluon-core/description ...@@ -23,23 +25,11 @@ define Package/gluon-core/description
Gluon community wifi mesh firmware framework: core Gluon community wifi mesh firmware framework: core
endef endef
define Build/Compile
$(call Build/Compile/Default,all)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-core/install define Package/gluon-core/install
$(CP) ./files/* $(1)/ $(Gluon/Build/Install)
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon $(INSTALL_DIR) $(1)/lib/gluon
echo '$(GLUON_VERSION)' > $(1)/lib/gluon/gluon-version echo '$(GLUON_VERSION)' > $(1)/lib/gluon/gluon-version
endef endef
define Package/gluon-core/postinst $(eval $(call BuildPackageGluon,gluon-core))
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-core))
...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-ebtables-filter-multicast ...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-ebtables-filter-multicast
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include ../gluon.mk
define Package/gluon-ebtables-filter-multicast define Package/gluon-ebtables-filter-multicast
SECTION:=gluon SECTION:=gluon
...@@ -21,11 +21,4 @@ define Package/gluon-ebtables-filter-multicast/description ...@@ -21,11 +21,4 @@ define Package/gluon-ebtables-filter-multicast/description
Allowed protocols are: DHCP, DHCPv6, ARP, ICMP, ICMPv6, BitTorrent local peer discovery, BABEL and OSPF Allowed protocols are: DHCP, DHCPv6, ARP, ICMP, ICMPv6, BitTorrent local peer discovery, BABEL and OSPF
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-ebtables-filter-multicast))
endef
define Package/gluon-ebtables-filter-multicast/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,gluon-ebtables-filter-multicast))
...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-ebtables-filter-ra-dhcp ...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-ebtables-filter-ra-dhcp
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include ../gluon.mk
define Package/gluon-ebtables-filter-ra-dhcp define Package/gluon-ebtables-filter-ra-dhcp
SECTION:=gluon SECTION:=gluon
...@@ -20,11 +20,4 @@ define Package/gluon-ebtables-filter-ra-dhcp/description ...@@ -20,11 +20,4 @@ define Package/gluon-ebtables-filter-ra-dhcp/description
client network, and not vice-versa. client network, and not vice-versa.
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-ebtables-filter-ra-dhcp))
endef
define Package/gluon-ebtables-filter-ra-dhcp/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,gluon-ebtables-filter-ra-dhcp))
...@@ -4,6 +4,8 @@ PKG_NAME:=gluon-ebtables-limit-arp ...@@ -4,6 +4,8 @@ PKG_NAME:=gluon-ebtables-limit-arp
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
define Package/gluon-ebtables-limit-arp define Package/gluon-ebtables-limit-arp
...@@ -37,9 +39,10 @@ define Package/gluon-ebtables-limit-arp/description ...@@ -37,9 +39,10 @@ define Package/gluon-ebtables-limit-arp/description
endef endef
define Package/gluon-ebtables-limit-arp/install define Package/gluon-ebtables-limit-arp/install
mkdir -p $(1)/usr/sbin/ $(Gluon/Build/Install)
$(INSTALL_DIR) $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/gluon-arp-limiter $(1)/usr/sbin/gluon-arp-limiter $(CP) $(PKG_BUILD_DIR)/gluon-arp-limiter $(1)/usr/sbin/gluon-arp-limiter
$(CP) ./files/* $(1)/
endef endef
$(eval $(call BuildPackage,gluon-ebtables-limit-arp)) $(eval $(call BuildPackageGluon,gluon-ebtables-limit-arp))
...@@ -18,16 +18,4 @@ define Package/gluon-ebtables-source-filter/description ...@@ -18,16 +18,4 @@ define Package/gluon-ebtables-source-filter/description
traffic entering the network via the nodes. traffic entering the network via the nodes.
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-ebtables-source-filter))
endef
define Package/gluon-ebtables-source-filter/install
$(CP) ./files/* $(1)/
endef
define Package/gluon-ebtables-source-filter/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-ebtables-source-filter))
...@@ -17,16 +17,4 @@ define Package/gluon-ebtables/description ...@@ -17,16 +17,4 @@ define Package/gluon-ebtables/description
Gluon community wifi mesh firmware framework: ebtables support Gluon community wifi mesh firmware framework: ebtables support
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-ebtables))
endef
define Package/gluon-ebtables/install
$(CP) ./files/* $(1)/
endef
define Package/gluon-ebtables/postinst
#!/bin/sh
$(call GluonCheckSite,check_site.lua)
endef
$(eval $(call BuildPackage,gluon-ebtables))
...@@ -12,13 +12,4 @@ define Package/gluon-l3roamd ...@@ -12,13 +12,4 @@ define Package/gluon-l3roamd
DEPENDS:=+gluon-core +l3roamd DEPENDS:=+gluon-core +l3roamd
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-l3roamd))
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-l3roamd/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
$(eval $(call BuildPackage,gluon-l3roamd))
...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-lock-password ...@@ -4,7 +4,7 @@ PKG_NAME:=gluon-lock-password
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include ../gluon.mk
define Package/gluon-lock-password define Package/gluon-lock-password
SECTION:=gluon SECTION:=gluon
...@@ -17,11 +17,4 @@ define Package/gluon-lock-password/description ...@@ -17,11 +17,4 @@ define Package/gluon-lock-password/description
This packages locks the root account by default. This packages locks the root account by default.
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-lock-password))
endef
define Package/gluon-lock-password/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,gluon-lock-password))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment