Merge pull request #2316 from freifunk-gluon/gluon-version

Clean up Gluon version number handling, allow .scmversion override

package/gluon-radvd/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-radvd
-PKG_VERSION:=3
 
 include ../gluon.mk
 

package/gluon-respondd/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-respondd
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-scheduled-domain-switch/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-scheduled-domain-switch
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-setup-mode/Makefile

@@ -4,7 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-setup-mode
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-site/Makefile

@@ -3,15 +3,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-site
 
 GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR))
-GLUON_SITE_VERSION = $(shell ( cd '$(GLUON_SITEDIR)' && git --git-dir=.git describe --always --dirty=+ ) 2>/dev/null || echo unknown)
-PKG_VERSION:=$(if $(DUMP),x,$(GLUON_SITE_VERSION))
 
-PKG_CONFIG_DEPENDS := CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_SITE_VERSION CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN
 PKG_FILE_DEPENDS := $(GLUON_SITEDIR)/site.conf $(GLUON_SITEDIR)/domains/ $(GLUON_SITEDIR)/i18n/
 PKG_BUILD_DEPENDS := lua-jsonc/host gluon-web/host
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
 include ../gluon.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
@@ -21,6 +17,11 @@ define Package/gluon-site
 endef
 
 define Package/gluon-site/config
+config GLUON_SITE_VERSION
+	string "Gluon site version number"
+	depends on PACKAGE_gluon-site
+	default ""
+
 config GLUON_RELEASE
 	string "Gluon release number"
 	depends on PACKAGE_gluon-site
@@ -83,7 +84,7 @@ define Package/gluon-site/install
 	$(CP) $(PKG_BUILD_DIR)/domains $(1)/lib/gluon/
   endif
 
-	echo '$(GLUON_SITE_VERSION)' > $(1)/lib/gluon/site-version
+	echo '$(call qstrip,$(CONFIG_GLUON_SITE_VERSION))' > $(1)/lib/gluon/site-version
 	echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release
 
 	$(GluonInstallI18N)

package/gluon-state-check/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-state-check
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-status-page-mesh-batman-adv/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-status-page-mesh-batman-adv
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-status-page/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-status-page
-PKG_VERSION:=3
 
 include ../gluon.mk
 

package/gluon-wan-dnsmasq/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-wan-dnsmasq
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-web-admin/Makefile

@@ -4,8 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-admin
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-autoupdater/Makefile

@@ -4,8 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-autoupdater
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-logging/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-logging
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

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

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-mesh-vpn-fastd
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-model/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-model
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-web-network/Makefile

@@ -4,8 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-network
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-node-role/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-node-role
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-web-osm/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-osm
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-web-private-wifi/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-private-wifi
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-wifi-config/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-wifi-config
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web
-PKG_VERSION:=1
 
 PKG_INSTALL:=1