diff mbox series

[V2,2/5] systemd-boot: upgrade from 255.6 to 256

Message ID 20240711075637.3023203-2-Qi.Chen@windriver.com
State Accepted, archived
Commit c3f53f641d04109bf88e51e44debb6c74582b5d0
Headers show
Series [V2,1/5] systemd: upgrade from 255.6 to 256 | expand

Commit Message

ChenQi July 11, 2024, 7:56 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

Patch 0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
is added to resolve build time error.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...ve_255.6.bb => systemd-boot-native_256.bb} |  0
 ...temd-boot_255.6.bb => systemd-boot_256.bb} |  2 ++
 ...on.build-ensure-VERSION_TAG-exists-i.patch | 32 +++++++++++++++++++
 3 files changed, 34 insertions(+)
 rename meta/recipes-core/systemd/{systemd-boot-native_255.6.bb => systemd-boot-native_256.bb} (100%)
 rename meta/recipes-core/systemd/{systemd-boot_255.6.bb => systemd-boot_256.bb} (95%)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
diff mbox series

Patch

diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.6.bb b/meta/recipes-core/systemd/systemd-boot-native_256.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot-native_255.6.bb
rename to meta/recipes-core/systemd/systemd-boot-native_256.bb
diff --git a/meta/recipes-core/systemd/systemd-boot_255.6.bb b/meta/recipes-core/systemd/systemd-boot_256.bb
similarity index 95%
rename from meta/recipes-core/systemd/systemd-boot_255.6.bb
rename to meta/recipes-core/systemd/systemd-boot_256.bb
index 9a6d8e9d6e..dd06b6218b 100644
--- a/meta/recipes-core/systemd/systemd-boot_255.6.bb
+++ b/meta/recipes-core/systemd/systemd-boot_256.bb
@@ -1,6 +1,8 @@ 
 require systemd.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
+SRC_URI += "file://0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch"
+
 require conf/image-uefi.conf
 
 DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native"
diff --git a/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch b/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
new file mode 100644
index 0000000000..6f02ea2f43
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch
@@ -0,0 +1,32 @@ 
+From 9df06062cebd0390d33de9694e9cb1c9fa7b8697 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 3 Jul 2024 23:18:41 -0700
+Subject: [PATCH] src/boot/efi/meson.build: ensure VERSION_TAG exists in case
+ of cross build
+
+The GIT_VERSION is changed to use VERSION_TAG, but in case of cross build
+for src/boot/efi, it's not set, causing build error because the compiler cannot
+know it's a macro thus treating it as some variable and error out.
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33612]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/boot/efi/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index 7a60b0ec7e..99d108d6e8 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -65,6 +65,7 @@ endforeach
+ 
+ if meson.is_cross_build() and get_option('sbat-distro') == 'auto'
+         warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.')
++        efi_conf.set_quoted('VERSION_TAG', version_tag)
+ elif get_option('sbat-distro') != ''
+         efi_conf.set_quoted('SBAT_PROJECT', meson.project_name())
+         efi_conf.set_quoted('PROJECT_VERSION', meson.project_version().split('~')[0])
+-- 
+2.45.1
+