mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

fwupd-efi: upgrade to 1.2

Browse Source 
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ross Burton
2022-02-01 16:52:48 +00:00
committed by Khem Raj
parent ff9442e0f9
commit 880defa729
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch
+5 -5
View File
@@ -20,7 +20,7 @@ index e42b365..4831a48 100755
import sys import sys
import argparse import argparse
@@ -19,7 +20,7 @@ def _generate_sbat(args): @@ -19,7 +20,7 @@ def _generate_sbat(args):
FWUPD_URL = "https://github.com/fwupd/fwupd" FWUPD_URL = "https://github.com/fwupd/fwupd-efi"
subprocess.run( subprocess.run(
- [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True - [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True
@@ -32,13 +32,13 @@ diff --git a/efi/meson.build b/efi/meson.build
index 68ea4aa..dcf0d43 100644 index 68ea4aa..dcf0d43 100644
--- a/efi/meson.build --- a/efi/meson.build
+++ b/efi/meson.build +++ b/efi/meson.build
@@ -184,7 +184,7 @@ o_file5 = custom_target('fwup-sbat.o', @@ -187,7 +187,7 @@ o_file5 = custom_target('fwup-sbat.o',
command : [ command : [
join_paths(meson.current_source_dir(), 'generate_sbat.py'), generate_sbat,
'@OUTPUT@', '@OUTPUT@',
- '--cc', efi_cc, - '--cc', efi_cc,
+ '--cc', ' '.join(efi_cc), + '--cc', ' '.join(efi_cc),
'--objcopy', efi_objcopy, '--objcopy', objcopy,
'--project-name', meson.project_name(), '--project-name', meson.project_name(),
'--project-version', meson.project_version(), '--project-version', meson.project_version(),
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
@@ -49,5 +49,5 @@ index d869cd2..17ef7fb 100644
-option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') -option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
+option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules') +option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules')
option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules')
option('efi-objcopy', type : 'string', value : 'objcopy', description : 'the objcopy utility to use for EFI modules')
option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb → meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb
+1 -2
View File
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
file://cc.patch" file://cc.patch"
SRCREV = "fee1b8f6473cb403b8ae7a56961ba0557e3f3efa" SRCREV = "8de5918507dcc797e612aac688d6b60b90053f54"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS = "gnu-efi" DEPENDS = "gnu-efi"
@@ -20,7 +20,6 @@ SBAT_DISTRO_URL ?= ""
EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \
-Defi-ld='${HOST_PREFIX}ld' \ -Defi-ld='${HOST_PREFIX}ld' \
-Defi-objcopy='${OBJCOPY}' \
-Defi-includedir=${STAGING_INCDIR}/efi \ -Defi-includedir=${STAGING_INCDIR}/efi \
-Defi-libdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \
-Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \