Version is now specified in the makefile

git describe doesn't work for tarball releases

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/Makefile b/Makefile
index 73621e0bc1a6df52d76e337a5c4e510680e521f7..61a624558e5876c9ab624699403d67474600037a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+VERSION=1.3.3
+
 PREFIX?=/usr/local
 PKG_CONFIG?=pkg-config
 INSTALL=install
@@ -46,7 +48,6 @@ CARGO_PROFILE=release
 
 CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
 CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
-VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit)
 
 include Makefile.compiler
 

diff --git a/cmd_version.c b/cmd_version.c
index 3fb4b6e2c503427d6acddbfec02ee65bc367edd0..5fe30e5e328d033c323301d0f941caac8ccfd2fd 100644 (file)
--- a/cmd_version.c
+++ b/cmd_version.c
@@ -4,6 +4,6 @@
 
 int cmd_version(int argc, char *argv[])
 {
-       printf("bcachefs tool version %s\n", VERSION_STRING);
+       printf("%s\n", VERSION_STRING);
        return 0;
 }