From: James Hilliard Date: Sat, 10 Jul 2021 10:36:50 +0000 (-0600) Subject: Disable non-explicit sbatvars autodetection for cross builds. X-Git-Tag: v250-rc1~963 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6d1fd995f9a4789a26e7156254b981e507fa14c;p=thirdparty%2Fsystemd.git Disable non-explicit sbatvars autodetection for cross builds. Since autodetection is unlikely to work reliably for cross builds disable it unless explicitly enabled. Signed-off-by: James Hilliard --- diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index afdf739d9b7..62d826bec67 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -115,7 +115,7 @@ if have_gnu_efi ['sbat-distro-url', 'BUG_REPORT_URL']] foreach sbatvar : sbatvars value = get_option(sbatvar[0]) - if value == '' or value == 'auto' + if (value == '' and not meson.is_cross_build()) or value == 'auto' 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))