From 76940e0a041b4278e2f1550fb68b2f31236ad09d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Mar 2024 15:15:55 +0100 Subject: [PATCH 1/2] Use VERSION_TAG instead of GIT_VERSION in kernel-install scripts GIT_VERSION only makes sense for C files as it depends on C preprocessor macro expansion now so let's use VERSION_TAG instead of GIT_VERSION for the two remaining usages of GIT_VERSION that are not in C files. --- src/kernel-install/60-ukify.install.in | 2 +- src/kernel-install/90-loaderentry.install.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel-install/60-ukify.install.in b/src/kernel-install/60-ukify.install.in index c7fe5108cc..3611737962 100755 --- a/src/kernel-install/60-ukify.install.in +++ b/src/kernel-install/60-ukify.install.in @@ -27,7 +27,7 @@ from shutil import which from pathlib import Path from typing import Optional -__version__ = '{{PROJECT_VERSION_FULL}} ({{GIT_VERSION}})' +__version__ = '{{PROJECT_VERSION_FULL}} ({{VERSION_TAG}})' try: VERBOSE = int(os.environ['KERNEL_INSTALL_VERBOSE']) > 0 diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in index 02435a31dd..610460b829 100755 --- a/src/kernel-install/90-loaderentry.install.in +++ b/src/kernel-install/90-loaderentry.install.in @@ -181,7 +181,7 @@ mkdir -p "${LOADER_ENTRY%/*}" || { [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Creating $LOADER_ENTRY" { echo "# Boot Loader Specification type#1 entry" - echo "# File created by $0 (systemd {{GIT_VERSION}})" + echo "# File created by $0 (systemd {{VERSION_TAG}})" echo "title $PRETTY_NAME $KERNEL_VERSION" echo "version $KERNEL_VERSION" if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then From 5c25f9dbc571fae0cddb8a5970e39c65d93943c7 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Mar 2024 15:16:52 +0100 Subject: [PATCH 2/2] meson: Remove version_h dependency from jinja2_cmdline version_h includes GIT_VERSION which only makes sense for C files which aren't preprocessed by jinja2 so remove the argument. The end result of this change is that the man pages are not recompiled anymore every time GIT_VERSION changes. --- meson.build | 2 +- tools/meson-render-jinja2.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index dc7e2b9a7b..7ac331fb36 100644 --- a/meson.build +++ b/meson.build @@ -1887,7 +1887,7 @@ config_h = configure_file( userspace_c_args += ['-include', 'config.h'] -jinja2_cmdline = [meson_render_jinja2, config_h, version_h] +jinja2_cmdline = [meson_render_jinja2, config_h] userspace = declare_dependency( compile_args : userspace_c_args, diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py index 3a3d912d8f..977de79378 100755 --- a/tools/meson-render-jinja2.py +++ b/tools/meson-render-jinja2.py @@ -33,12 +33,11 @@ def render(filename, defines): def main(): defines = parse_config_h(sys.argv[1]) - defines.update(parse_config_h(sys.argv[2])) - output = render(sys.argv[3], defines) - with open(sys.argv[4], 'w') as f: + output = render(sys.argv[2], defines) + with open(sys.argv[3], 'w') as f: f.write(output) - info = os.stat(sys.argv[3]) - os.chmod(sys.argv[4], info.st_mode) + info = os.stat(sys.argv[2]) + os.chmod(sys.argv[3], info.st_mode) if __name__ == '__main__': main()