nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: move package Makefile boilerplate to gluon.mk

Browse Source
This commit is contained in:
Matthias Schiffer 2018-03-08 19:49:41 +01:00
parent ee14a03e70
commit 60522ee253
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
45 changed files with 140 additions and 589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/gluon-alfred/Makefile
View File

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

15
package/gluon-authorized-keys/Makefile
View File

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

19
package/gluon-autoupdater/Makefile
View File

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

15
package/gluon-client-bridge/Makefile
View File

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

14
package/gluon-config-mode-autoupdater/Makefile
View File

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

19
package/gluon-config-mode-contact-info/Makefile
View File

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

14
package/gluon-config-mode-core/Makefile
View File

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

15
package/gluon-config-mode-domain-select/Makefile
View File

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

19
package/gluon-config-mode-geo-location/Makefile
View File

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

14
package/gluon-config-mode-hostname/Makefile
View File

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

14
package/gluon-config-mode-mesh-vpn/Makefile
View File

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

13
package/gluon-config-mode-theme/Makefile
View File

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

18
package/gluon-core/Makefile
View File

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

11
package/gluon-ebtables-filter-multicast/Makefile
View File

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

11
package/gluon-ebtables-filter-ra-dhcp/Makefile
View File

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

9
package/gluon-ebtables-limit-arp/Makefile
View File

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

14
package/gluon-ebtables-source-filter/Makefile
View File

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

14
package/gluon-ebtables/Makefile
View File

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

11
package/gluon-l3roamd/Makefile
View File

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

11
package/gluon-lock-password/Makefile
View File

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

34
package/gluon-mesh-batman-adv/Makefile
View File

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

16
package/gluon-mesh-vpn-core/Makefile
View File

@ -13,18 +13,4 @@ define Package/gluon-mesh-vpn-core
USERID:=:gluon-mesh-vpn=800 USERID:=:gluon-mesh-vpn=800
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-mesh-vpn-core))
$(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))

21
package/gluon-mesh-vpn-fastd/Makefile
View File

@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-fastd PKG_NAME:=gluon-mesh-vpn-fastd
PKG_VERSION:=3 PKG_VERSION:=3
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk include ../gluon.mk
define Package/gluon-mesh-vpn-fastd 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 DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-mesh-vpn-fastd))
$(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))

16
package/gluon-mesh-vpn-tunneldigger/Makefile
View File

@ -12,18 +12,4 @@ define Package/gluon-mesh-vpn-tunneldigger
DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-mesh-vpn-tunneldigger))
$(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))

12
package/gluon-neighbour-info/Makefile
View File

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

22
package/gluon-node-info/Makefile
View File

@ -4,11 +4,8 @@ PKG_NAME:=gluon-node-info
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk include ../gluon.mk
define Package/gluon-node-info define Package/gluon-node-info
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -16,21 +13,4 @@ define Package/gluon-node-info
DEPENDS:=+gluon-core +libgluonutil DEPENDS:=+gluon-core +libgluonutil
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-node-info))
$(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))

14
package/gluon-radv-filterd/Makefile
View File

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

11
package/gluon-radvd/Makefile
View File

@ -16,13 +16,4 @@ define Package/gluon-radvd/description
Gluon community wifi mesh firmware framework: Advertise an IPv6 prefix from the node Gluon community wifi mesh firmware framework: Advertise an IPv6 prefix from the node
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-radvd))
$(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))

14
package/gluon-respondd/Makefile
View File

@ -12,16 +12,4 @@ define Package/gluon-respondd
DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-respondd))
$(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))

16
package/gluon-setup-mode/Makefile
View File

@ -19,18 +19,4 @@ define Package/gluon-setup-mode/description
Offline mode to perform basic setup in a secure manner. Offline mode to perform basic setup in a secure manner.
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-setup-mode))
$(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))

4
package/gluon-site/Makefile
View File

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

19
package/gluon-status-page/Makefile
View File

@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-status-page PKG_NAME:=gluon-status-page
PKG_VERSION:=3 PKG_VERSION:=3
include ../gluon.mk GLUON_PKG_MAKE:=1
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) include ../gluon.mk
define Package/gluon-status-page define Package/gluon-status-page
SECTION:=gluon 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 DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua +libbatadv
endef 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 define Package/gluon-status-page/install
$(Gluon/Build/Install)
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/{neighbours-batadv,stations} $(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/ $(INSTALL_DIR) $(1)/lib/gluon/status-page/view/
$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/status-page/ $(LN) /lib/gluon/web/i18n $(1)/lib/gluon/status-page/
$(LN) /lib/gluon/web/view/error $(1)/lib/gluon/status-page/view/ $(LN) /lib/gluon/web/view/error $(1)/lib/gluon/status-page/view/
$(call GluonInstallI18N,gluon-status-page,$(1))
endef endef
$(eval $(call BuildPackage,gluon-status-page)) $(eval $(call BuildPackageGluon,gluon-status-page))

11
package/gluon-wan-dnsmasq/Makefile
View File

@ -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 Gluon community wifi mesh firmware framework: Support for a secondary DNS server using the WAN interface
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-wan-dnsmasq))
$(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))

20
package/gluon-web-admin/Makefile
View File

@ -9,8 +9,6 @@ PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-admin define Package/gluon-web-admin
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -18,20 +16,4 @@ define Package/gluon-web-admin
DEPENDS:=+gluon-config-mode-core +pretty-hostname DEPENDS:=+gluon-config-mode-core +pretty-hostname
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-admin))
$(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))

14
package/gluon-web-autoupdater/Makefile
View File

@ -9,8 +9,6 @@ PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-autoupdater define Package/gluon-web-autoupdater
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -18,14 +16,4 @@ define Package/gluon-web-autoupdater
DEPENDS:=+gluon-web-admin +gluon-autoupdater DEPENDS:=+gluon-web-admin +gluon-autoupdater
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-autoupdater))
$(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))

14
package/gluon-web-logging/Makefile
View File

@ -6,8 +6,6 @@ PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-logging define Package/gluon-web-logging
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -15,14 +13,4 @@ define Package/gluon-web-logging
TITLE:=UI for remote syslog configuration TITLE:=UI for remote syslog configuration
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-logging))
$(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))

20
package/gluon-web-mesh-vpn-fastd/Makefile
View File

@ -6,8 +6,6 @@ PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-mesh-vpn-fastd define Package/gluon-web-mesh-vpn-fastd
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -15,20 +13,4 @@ define Package/gluon-web-mesh-vpn-fastd
DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-mesh-vpn-fastd))
$(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))

14
package/gluon-web-model/Makefile
View File

@ -12,16 +12,4 @@ define Package/gluon-web-model
DEPENDS:=+gluon-web DEPENDS:=+gluon-web
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-model))
$(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))

14
package/gluon-web-network/Makefile
View File

@ -9,8 +9,6 @@ PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-network define Package/gluon-web-network
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -18,14 +16,4 @@ define Package/gluon-web-network
DEPENDS:=+gluon-web-admin +gluon-client-bridge DEPENDS:=+gluon-web-admin +gluon-client-bridge
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-network))
$(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))

19
package/gluon-web-node-role/Makefile
View File

@ -5,8 +5,6 @@ PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-node-role define Package/gluon-web-node-role
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -14,19 +12,4 @@ define Package/gluon-web-node-role
TITLE:=UI for specifying node role TITLE:=UI for specifying node role
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web-node-role))
$(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))

14
package/gluon-web-private-wifi/Makefile
View File

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

14
package/gluon-web-wifi-config/Makefile
View File

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

23
package/gluon-web/Makefile
View File

@ -3,12 +3,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web PKG_NAME:=gluon-web
PKG_VERSION:=1 PKG_VERSION:=1
include ../gluon.mk GLUON_PKG_MAKE:=1
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
PKG_INSTALL:=1 PKG_INSTALL:=1
include ../gluon.mk
define Package/gluon-web define Package/gluon-web
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
@ -28,18 +27,4 @@ define Package/gluon-web/config
$(foreach lang,$(GLUON_SUPPORTED_LANGS),$(call lang-config,$(lang))) $(foreach lang,$(GLUON_SUPPORTED_LANGS),$(call lang-config,$(lang)))
endef endef
define Build/Compile $(eval $(call BuildPackageGluon,gluon-web))
$(call Build/Compile/Default)
$(call GluonBuildI18N,gluon-web,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-web/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(call GluonInstallI18N,gluon-web,$(1))
endef
$(eval $(call BuildPackage,gluon-web))

70
package/gluon.mk
View File

@ -4,6 +4,11 @@ PKG_FILE_DEPENDS += $(GLUON_MK)
# Dependencies for LuaSrcDiet # Dependencies for LuaSrcDiet
PKG_BUILD_DEPENDS += luci-base/host PKG_BUILD_DEPENDS += luci-base/host
ifneq ($(wildcard ./src/respondd.c),)
PKG_BUILD_DEPENDS += respondd
GLUON_PKG_MAKE ?= 1
endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -26,22 +31,26 @@ GLUON_LANG_fr := French
GLUON_I18N_CONFIG := $(foreach lang,$(GLUON_SUPPORTED_LANGS),CONFIG_GLUON_WEB_LANG_$(lang)) GLUON_I18N_CONFIG := $(foreach lang,$(GLUON_SUPPORTED_LANGS),CONFIG_GLUON_WEB_LANG_$(lang))
GLUON_ENABLED_LANGS := en $(foreach lang,$(GLUON_SUPPORTED_LANGS),$(if $(CONFIG_GLUON_WEB_LANG_$(lang)),$(lang))) GLUON_ENABLED_LANGS := en $(foreach lang,$(GLUON_SUPPORTED_LANGS),$(if $(CONFIG_GLUON_WEB_LANG_$(lang)),$(lang)))
ifneq ($(wildcard ./i18n/.),)
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
endif
define GluonBuildI18N define GluonBuildI18N
mkdir -p $$(PKG_BUILD_DIR)/i18n mkdir -p $$(PKG_BUILD_DIR)/i18n
for lang in $$(GLUON_ENABLED_LANGS); do \ for lang in $$(GLUON_ENABLED_LANGS); do \
if [ -e $(2)/$$$$lang.po ]; then \ if [ -e $(1)/$$$$lang.po ]; then \
rm -f $$(PKG_BUILD_DIR)/i18n/$(1).$$$$lang.lmo; \ rm -f $$(PKG_BUILD_DIR)/i18n/$$$$lang.lmo; \
po2lmo $(2)/$$$$lang.po $$(PKG_BUILD_DIR)/i18n/$(1).$$$$lang.lmo; \ po2lmo $(1)/$$$$lang.po $$(PKG_BUILD_DIR)/i18n/$$$$lang.lmo; \
fi; \ fi; \
done done
endef endef
define GluonInstallI18N define GluonInstallI18N
$$(INSTALL_DIR) $(2)/lib/gluon/web/i18n $$(INSTALL_DIR) $(1)/lib/gluon/web/i18n
for lang in $$(GLUON_ENABLED_LANGS); do \ for lang in $$(GLUON_ENABLED_LANGS); do \
if [ -e $$(PKG_BUILD_DIR)/i18n/$(1).$$$$lang.lmo ]; then \ if [ -e $$(PKG_BUILD_DIR)/i18n/$$$$lang.lmo ]; then \
$$(INSTALL_DATA) $$(PKG_BUILD_DIR)/i18n/$(1).$$$$lang.lmo $(2)/lib/gluon/web/i18n/$(1).$$$$lang.lmo; \ $$(INSTALL_DATA) $$(PKG_BUILD_DIR)/i18n/$$$$lang.lmo $(1)/lib/gluon/web/i18n/$(PKG_NAME).$$$$lang.lmo; \
fi; \ fi; \
done done
endef endef
@ -56,3 +65,52 @@ define GluonSrcDiet
fi; \ fi; \
done done
endef endef
GLUON_PKG_MAKE ?= 0
define Gluon/Build/Compile
$(if $(findstring $(GLUON_PKG_MAKE),1),
$(Build/Compile/Default)
)
$(if $(wildcard ./luasrc/.),
$(call GluonSrcDiet,luasrc,$(PKG_BUILD_DIR)/luadest/)
)
$(if $(wildcard ./i18n/.),
$(call GluonBuildI18N,i18n)
)
endef
define Gluon/Build/Install
$(if $(findstring $(PKG_INSTALL),1),
$(CP) $(PKG_INSTALL_DIR)/. $(1)/
)
$(if $(wildcard ./files/.),
$(CP) ./files/. $(1)/
)
$(if $(wildcard ./luasrc/.),
$(CP) $(PKG_BUILD_DIR)/luadest/. $(1)/
)
$(if $(wildcard ./src/respondd.c),
$(INSTALL_DIR) $(1)/lib/gluon/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/$(PKG_NAME).so
)
$(if $(wildcard ./i18n/.),
$(GluonInstallI18N)
)
endef
Build/Compile=$(call Gluon/Build/Compile)
define BuildPackageGluon
Package/$(1)/install ?= $$(Gluon/Build/Install)
ifneq ($(wildcard check_site.lua),)
define Package/$(1)/postinst
#!/bin/sh
$$(call GluonCheckSite,check_site.lua)
endef
endif
$$(eval $$(call BuildPackage,$(1)))
endef

2
package/libgluonutil/Makefile
View File

@ -6,7 +6,7 @@ CMAKE_INSTALL:=1
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
include ../gluon.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/libgluonutil define Package/libgluonutil