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

Clean up Gluon version number handling, allow .scmversion override

package/gluon-wireless-encryption/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-wireless-encryption
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon.mk

 GLUON_MK := $(abspath $(lastword $(MAKEFILE_LIST)))
 PKG_FILE_DEPENDS += $(GLUON_MK)
 
+PKG_VERSION ?= 1
+
 PKG_BUILD_DEPENDS += luasrcdiet/host
 
 ifneq ($(wildcard ./luasrc/.),)

scripts/getversion.sh

+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+	echo >&2 "Usage: getversion.sh <directory>"
+	exit 1
+fi
+
+cd "$1" || exit 1
+
+cat .scmversion 2>/dev/null && exit 0
+git --git-dir=.git describe --always --abbrev=7 --dirty=+ 2>/dev/null && exit 0
+
+echo unknown

targets/generic

@@ -2,6 +2,8 @@ assert(env.GLUON_LANGS)
 
 
 config('GLUON_SITEDIR', env.GLUON_SITEDIR)
+config('GLUON_VERSION', env.GLUON_VERSION)
+config('GLUON_SITE_VERSION', env.GLUON_SITE_VERSION)
 config('GLUON_RELEASE', env.GLUON_RELEASE)
 
 try_config('GLUON_AUTOUPDATER_BRANCH', env.GLUON_AUTOUPDATER_BRANCH)