Skip to content

Commit

Permalink
build: allow overriding GLUON_SITE_VERSION (freifunk-gluon#3091)
Browse files Browse the repository at this point in the history
In case a community does not use Git for versioning it's site or using a
different versioning scheme that do not have annotated tags on the
master branch.

Signed-off-by: David Bauer <[email protected]>
  • Loading branch information
blocktrron authored Dec 13, 2023
1 parent 926263b commit 19976e2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ $(eval $(call mkabspath,GLUON_TARGETSDIR))
$(eval $(call mkabspath,GLUON_PATCHESDIR))

GLUON_VERSION := $(shell scripts/getversion.sh '.')
GLUON_SITE_VERSION := $(shell scripts/getversion.sh '$(GLUON_SITEDIR)')

# Set default SITE_VERSION if not set by user
GLUON_SITE_VERSION ?= $(shell scripts/getversion.sh '$(GLUON_SITEDIR)')

GLUON_MULTIDOMAIN ?= 0
GLUON_AUTOREMOVE ?= 0
Expand Down
5 changes: 5 additions & 0 deletions docs/user/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ GLUON_RELEASE
is available. The same GLUON_RELEASE has to be passed to ``make`` and ``make manifest``
to generate a correct manifest.

GLUON_SITE_VERSION
Version of the site configuration. This string is displayed in the config mode
and `gluon-info`. If unset, Gluon generates a version string using `git describe`
on the site folder.

GLUON_TARGET
Target architecture to build.

Expand Down

0 comments on commit 19976e2

Please sign in to comment.