mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +02:00
systemd-boot: upgrade from 255.6 to 256
Patch 0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch is added to resolve build time error. (From OE-Core rev: c3f53f641d04109bf88e51e44debb6c74582b5d0) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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"
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user