Merge pull request #28567 from yuwata/meson-versiondep

meson:  cleanups for version dependency

src/analyze/analyze.c

@@ -86,7 +86,6 @@
 #include "unit-name.h"
 #include "verb-log-control.h"
 #include "verbs.h"
-#include "version.h"
 
 DotMode arg_dot = DEP_ALL;
 char **arg_dot_from_patterns = NULL, **arg_dot_to_patterns = NULL;

src/basic/build.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "version.h"
-
 extern const char* const systemd_features;
 
 int version(void);

src/basic/meson.build

@@ -270,8 +270,7 @@ libbasic = static_library(
         dependencies : [libcap,
                         libm,
                         threads,
-                        userspace,
-                        versiondep],
+                        userspace],
         c_args : ['-fvisibility=default'],
         build_by_default : false)
 

src/boot/efi/meson.build

@@ -98,13 +98,9 @@ elif get_option('sbat-distro') != ''
 
         pkgver = get_option('sbat-distro-version')
         if pkgver == ''
-                efi_conf.set('SBAT_DISTRO_VERSION', 'GIT_VERSION')
-                # This is determined during build, not configuration, so we can't display it yet.
-                sbat_distro_version_display = '(git version)'
-        else
-                efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver)
-                sbat_distro_version_display = pkgver
+                pkgver = version_tag
         endif
+        efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver)
 endif
 
 summary({'UEFI architectures' : efi_arch + (efi_arch_alt == '' ? '' : ', ' + efi_arch_alt)},
@@ -114,7 +110,7 @@ if efi_conf.get('SBAT_DISTRO', '') != ''
         summary({
                 'SBAT distro':              efi_conf.get('SBAT_DISTRO'),
                 'SBAT distro generation':   efi_conf.get('SBAT_DISTRO_GENERATION'),
-                'SBAT distro version':      sbat_distro_version_display,
+                'SBAT distro version':      efi_conf.get('SBAT_DISTRO_VERSION'),
                 'SBAT distro summary':      efi_conf.get('SBAT_DISTRO_SUMMARY'),
                 'SBAT distro URL':          efi_conf.get('SBAT_DISTRO_URL')},
                 section : 'UEFI')

src/core/dbus-manager.c

@@ -39,6 +39,7 @@
 #include "strv.h"
 #include "syslog-util.h"
 #include "user-util.h"
+#include "version.h"
 #include "virt.h"
 #include "watchdog.h"
 

src/core/main.c

@@ -99,6 +99,7 @@
 #include "time-util.h"
 #include "umask-util.h"
 #include "user-util.h"
+#include "version.h"
 #include "virt.h"
 #include "watchdog.h"
 

src/core/manager-dump.c

@@ -7,6 +7,7 @@
 #include "manager-dump.h"
 #include "memstream-util.h"
 #include "unit-serialize.h"
+#include "version.h"
 
 void manager_dump_jobs(Manager *s, FILE *f, char **patterns, const char *prefix) {
         Job *j;

src/core/meson.build

@@ -130,8 +130,7 @@ libcore = shared_library(
                         libseccomp,
                         libselinux,
                         threads,
-                        userspace,
-                        versiondep],
+                        userspace],
         install : true,
         install_dir : pkglibdir)
 

src/fundamental/sbat.h

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "version.h"
-
 #ifdef SBAT_DISTRO
 #  define SBAT_SECTION_TEXT \
         "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md\n" \

src/shared/meson.build

@@ -311,8 +311,7 @@ libshared_deps = [threads,
                   libselinux,
                   libxenctrl,
                   libxz,
-                  libzstd,
-                  versiondep]
+                  libzstd]
 
 libshared_sym_path = '@0@/libshared.sym'.format(meson.current_source_dir())
 libshared_build_dir = meson.current_build_dir()

src/stdio-bridge/stdio-bridge.c

@@ -17,7 +17,6 @@
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "version.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
 

src/test/test-cgroup-setup.c

@@ -9,7 +9,6 @@
 #include "proc-cmdline.h"
 #include "string-util.h"
 #include "tests.h"
-#include "version.h"
 
 static void test_is_wanted_print_one(bool header) {
         _cleanup_free_ char *cmdline = NULL;

src/test/test-cgroup-util.c

@@ -15,7 +15,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "user-util.h"
-#include "version.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {
         _cleanup_free_ char *unit = NULL;

src/udev/meson.build

@@ -136,8 +136,7 @@ foreach prog : udev_progs
                 name,
                 prog,
                 include_directories : includes,
-                dependencies : [userspace,
-                                versiondep],
+                dependencies : [userspace],
                 link_with : udev_link_with,
                 install_rpath : udev_rpath,
                 install : true,

tools/meson-vcs-tag.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-set -eu
-set -o pipefail
-
-dir="${1:?}"
-fallback="${2:?}"
-
-# Apparently git describe has a bug where it always considers the work-tree
-# dirty when invoked with --git-dir (even though 'git status' is happy). Work
-# around this issue by cd-ing to the source directory.
-cd "$dir"
-# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)
-# and that we don't get confused if a tarball is extracted in a higher-level
-# git repository.
-[ -e .git ] && \
-    git describe --abbrev=7 --dirty=^ 2>/dev/null | sed 's/^v//; s/-rc/~rc/' || \
-    echo "$fallback"