From 76940e0a041b4278e2f1550fb68b2f31236ad09d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Mar 2024 15:15:55 +0100 Subject: [PATCH] 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