From 47bb2d53ce76b3a338d7f9c7315a42fbb2e2fdc4 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 16 Nov 2023 15:24:22 -0500 Subject: [PATCH] Version is now specified in the makefile git describe doesn't work for tarball releases Signed-off-by: Kent Overstreet --- Makefile | 3 ++- cmd_version.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 73621e0..61a6245 100644 --- 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 3fb4b6e..5fe30e5 100644 --- 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; } -- 2.39.2