Merge pull request #11230 from keszybz/version-string-alt

Generate version string from git describe (alternative approach)

src/basic/build.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include "version.h"
+
 #if HAVE_PAM
 #define _PAM_FEATURE_ "+PAM"
 #else

src/basic/meson.build

@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
+version_h = vcs_tag(
+        command: vcs_tagger,
+        input : 'version.h.in',
+        output : 'version.h')
+
 basic_sources = files('''
         MurmurHash2.c
         MurmurHash2.h

src/basic/util.c

@@ -557,7 +557,7 @@ uint64_t system_tasks_max_scale(uint64_t v, uint64_t max) {
 }
 
 int version(void) {
-        puts(PACKAGE_STRING "\n"
+        puts("systemd " GIT_VERSION "\n"
              SYSTEMD_FEATURES);
         return 0;
 }

src/basic/version.h.in

@@ -0,0 +1 @@
+#define GIT_VERSION "@VCS_TAG@"