]> git.ipfire.org Git - thirdparty/wireguard-tools.git/commitdiff
Makefile: fix version indicator
authorFlorian Eckert <fe@dev.tdt.de>
Thu, 14 May 2020 09:35:20 +0000 (11:35 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Fri, 5 Mar 2021 21:37:11 +0000 (14:37 -0700)
If we execute `wg --version` we get a different version string that does
not match with the version string in the openwrt makefile.

Current version string:
`wireguard-tools vreboot-13159-gac5caa2718 -https://git.zx2c4.com/wireguard-tools/`

Corrected versions string:
`wireguard-tools v1.0.20200319 -https://git.zx2c4.com/wireguard-tools/`

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
src/Makefile

index 037d2ddca819bff7637fc666c1edee3df4613717..fc5e0c62d6dec4c9c31c11ff7b01efb2cd49bf8b 100644 (file)
@@ -48,7 +48,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR)\""
 ifeq ($(DEBUG),yes)
 CFLAGS += -g
 endif
-WIREGUARD_TOOLS_VERSION = $(patsubst v%,%,$(shell GIT_CEILING_DIRECTORIES="$(PWD)/../.." git describe --dirty 2>/dev/null))
+WIREGUARD_TOOLS_VERSION = $(patsubst v%,%,$(shell GIT_DIR="$(PWD)/../.git" git describe --dirty 2>/dev/null))
 ifneq ($(WIREGUARD_TOOLS_VERSION),)
 CFLAGS += -D'WIREGUARD_TOOLS_VERSION="$(WIREGUARD_TOOLS_VERSION)"'
 endif