You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
2.4 KiB
54 lines
2.4 KiB
2 years ago
|
From 340f8e02cf4db0e6b3733bfcc14630b3ce8181a5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Thu, 23 Dec 2021 13:19:42 +0100
|
||
|
|
Subject: [PATCH] meson: report SBAT settings
|
||
|
|
|
||
|
|
(cherry picked from commit e4e44a0107645891e82a538100a7590eb59a516c)
|
||
|
|
|
||
|
|
Related: #2017035
|
||
|
|
---
|
||
|
|
src/boot/efi/meson.build | 14 +++++++++++++-
|
||
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
|
||
|
|
index dd318079fc..e628068596 100644
|
||
|
|
--- a/src/boot/efi/meson.build
|
||
|
|
+++ b/src/boot/efi/meson.build
|
||
|
|
@@ -130,7 +130,6 @@ elif get_option('sbat-distro') != ''
|
||
|
|
if (value == '' or value == 'auto') and not meson.is_cross_build()
|
||
|
|
cmd = 'if [ -e /etc/os-release ]; then . /etc/os-release; else . /usr/lib/os-release; fi; echo $@0@'.format(sbatvar[1])
|
||
|
|
value = run_command(sh, '-c', cmd).stdout().strip()
|
||
|
|
- message('@0@ (from @1@): @2@'.format(sbatvar[0], sbatvar[1], value))
|
||
|
|
endif
|
||
|
|
if value == ''
|
||
|
|
error('Required @0@ option not set and autodetection failed'.format(sbatvar[0]))
|
||
|
|
@@ -147,8 +146,11 @@ 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
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
|
||
|
|
@@ -288,6 +290,16 @@ summary({
|
||
|
|
'EFI include directory' : efi_incdir},
|
||
|
|
section : 'Extensible Firmware Interface')
|
||
|
|
|
||
|
|
+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 summary': efi_conf.get('SBAT_DISTRO_SUMMARY'),
|
||
|
|
+ 'SBAT distro URL': efi_conf.get('SBAT_DISTRO_URL')},
|
||
|
|
+ section : 'Extensible Firmware Interface')
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
############################################################
|
||
|
|
|
||
|
|
efi_headers = files(
|