diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-24 23:59:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-24 23:59:27 +0100 |
commit | b987a550f067c3da93b0664cf1fdc8a624c0aa38 (patch) | |
tree | 9ad1767fad656d26471a81af6bac8400a1c75218 /sys-apps/fwupd-efi | |
parent | e3f21c8aff8a76afe3423721c437a088e9232840 (diff) |
gentoo auto-resync : 24:04:2024 - 23:59:27
Diffstat (limited to 'sys-apps/fwupd-efi')
-rw-r--r-- | sys-apps/fwupd-efi/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch | 107 | ||||
-rw-r--r-- | sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild (renamed from sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild) | 19 |
3 files changed, 8 insertions, 122 deletions
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index bde242263e6a..1f6c2e4c5f84 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,8 +1,8 @@ AUX fwupd-efi-1.4-efi_ld_override.patch 1219 BLAKE2B f501bd949a82d28bc9daaef5b62e726e18825a081a584b50358e566b5c3af1eb0eaf409d17d5947b85b4f15098bb5d12025037ddb7a74489b88a945fc8eafbbc SHA512 31f966a7babdaa3a232ca86df065ff8e3724829455a9a3ce733bbd8454bd2f45cd3abf0b2526793a6b20b60ed9fce39f87f3528fd89c8c15093d016b65fb3784 -AUX fwupd-efi-1.4-uefi_210_fixes.patch 3716 BLAKE2B 9399f95f71fa1180509320dce8eaa58c136a9365c5484283cc3e519179894cac146e0efb9929277e20c8c5cfb4d46ae6bad67047cb59726a3f8409d65efd32ee SHA512 0f6ac5eef011b0a839c598bdf4dfd7c338a8069486d7e575c6d0b5196609edb24d6b6d02de27f64d04c2f7096d54ce0c6ef2e4a8d5d2134da6799948e3e4153e DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 DIST fwupd-efi-1.5.tar.xz 38460 BLAKE2B fe2d06e9d9a588b524a6a26afc401898f8dd1d3bd49fa608cfaa6c32ec71a88f125d2158e3892a44706cc2f8349ed379ee8d7b62bfbe8ba38990d1545eff9f94 SHA512 b1edaa1fa4b7e768ee822c92bdd2858343993f19edde6445e333fad470f997420aeab10dd36e5abff90cb0a87d8f3b2a0de9e7cf49a03758e0e1c9c2fd06ef19 -EBUILD fwupd-efi-1.4-r1.ebuild 1448 BLAKE2B 88e6c9fdd1060bba21925fc1a8a1012cd69c06ab6af1007f653ce3b485d638590cac28232374014a508bc42ba090fb443d67e936d64ecc1f9da281a507a1ab72 SHA512 088e27e071306e7b8e443e2bd1056fa573b1e818e6482b689ae273dcfcac8a6c7fb7f71cff72ab7bd47b0c90269e1ba4494bdc990219bf45eab4e1847029cd7a +DIST fwupd-efi-1.6.tar.xz 39940 BLAKE2B 906f90a3187fb7d180dab22941d255220e3d56c2058ff6a5a260b0cd62c90e9c784a7c091da376111f23d02561abdec71958afec63c54134a77aac71deec20bc SHA512 37d3c1348bdead620e626a3e602dc6cd774c47d24ca18a3bf6aee071300d658bc4d37e6ec74fcd20f9b345141d69ea3343d44b9408af4759ad65ef10b72ead69 EBUILD fwupd-efi-1.4.ebuild 1399 BLAKE2B 726e24909760f613d5557fc5503a8658a5828b119173ba587bfb4b30d818991b87870ad5b3459b58d3c889014f6df997adf022d54fbb2296478d35c99cdb0143 SHA512 37343ef8181e59ee67da8f8508c63e601f96695f4bbdd260f2b82587817c2b931de5b8eb54b00183c036f2c3e94205e72881ac2524cb7a0b854c81bd995849bb EBUILD fwupd-efi-1.5.ebuild 1245 BLAKE2B 7e51261127cc41b07e83f1dab13e8249d07b360ca2cb82ac0cd90bcb529212c51d7441b0613f8c3a7a85991515e57833adab9687428b646718b40eda4fcf7eaf SHA512 fa3c44b846478c3f920c122fce44acf53b27a53af683deab1632439c9ab5abd76e4e08e88708d99951baae5a085417dba281fa99e00dd96848b8be27bf9fbd8f +EBUILD fwupd-efi-1.6.ebuild 1332 BLAKE2B b858460e7a267e000e4ed869fc33b29988ff0639ecd31e8162738fb162bb27d239ff0662763078c24eec35825ad603168069d76e8de856b830a5c63de3718ad8 SHA512 cb01e6b66825e83591ff2482ece081c550f2886c4ba46be70933064935357ac04bddb41304ca86d4a303589dd194e482e514a32819d020c67550bff716ef2a9b MISC metadata.xml 389 BLAKE2B 130ccd29eddd855aced2084c0d42873449a4a10e3dd65137ce1994669bb65784909ccf004a9aa19b2fc70a49bdfe469977da6acf49b14dd07ed62189a9a34e0c SHA512 843b9301455128a38a366bb5bc2e8b2867664a5a61710f9db4d1ed1fb814203ab8be4bcf64eb339b4af2bd6e5f1522ae61aed38e6f19dbee238a1721c8769a01 diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch deleted file mode 100644 index d4de5f174857..000000000000 --- a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch +++ /dev/null @@ -1,107 +0,0 @@ -From bd958f2e8f03a85a7e1fe40a3ca7b78e0b24b79f Mon Sep 17 00:00:00 2001 -From: Callum Farmer <gmbr3@opensuse.org> -Date: Sat, 11 Feb 2023 15:39:06 +0000 -Subject: [PATCH] UEFI 2.10 fixes - -Revert "Align sections to 512 bytes" - -This is not permitted according to the Microsoft -guidelines which require section alignment to be -the same as the page size of the architecture which -for all supported archs is the default in Binutils - -https://techcommunity.microsoft.com/t5/hardware-dev-center/new-uefi-ca-memory-mitigation-requirements-for-signing/ba-p/3608714 - -This reverts commit c60c0b8dfda71275ab40bdb316a6ca650c7a8948. - -Keep .areloc ARM32 section - -This is the psuedo .reloc section but renamed only on ARM32 to avoid -a bad RELSZ value (gnu-efi 3.0.18+) - -Only use 4KiB pages on aarch64 - -Binutils is currently configured by default -to use 64KiB pages on aarch64, however this -is not allowed by the UEFI specification - -Check if crt0 contains .note.GNU-stack section - -We need the .note.GNU-stack section for NX -compat. If we don't have a new enough -gnu-efi, error as the gnu-efi libraries -themselves must have been built as NX -for this to work - -Signed-off-by: Callum Farmer <gmbr3@opensuse.org> ---- - efi/crt0/meson.build | 1 + - efi/generate_binary.py | 4 ++-- - efi/meson.build | 12 +++++++++++- - 3 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/efi/crt0/meson.build b/efi/crt0/meson.build -index f5f45c5..fbd943e 100644 ---- a/efi/crt0/meson.build -+++ b/efi/crt0/meson.build -@@ -1,3 +1,4 @@ -+arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch) - o_crt0 = custom_target('efi_crt0', - input : arch_crt_source, - output : arch_crt, -diff --git a/efi/generate_binary.py b/efi/generate_binary.py -index bd2d959..e27f926 100755 ---- a/efi/generate_binary.py -+++ b/efi/generate_binary.py -@@ -31,9 +31,9 @@ def _run_objcopy(args): - "-j", - ".rodata", - "-j", -+ ".areloc", -+ "-j", - ".rel*", -- "--section-alignment", -- "512", - args.infile, - args.outfile, - ] -diff --git a/efi/meson.build b/efi/meson.build -index 1931855..a476884 100644 ---- a/efi/meson.build -+++ b/efi/meson.build -@@ -95,6 +95,11 @@ else - coff_header_in_crt0 = false - endif - -+# For NX compat, we must ensure we have .note.GNU-stack -+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0 -+ error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt))) -+endif -+ - # older objcopy for Aarch64 and ARM32 are not EFI capable. - # Use 'binary' instead, and add required symbols manually. - if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0)) -@@ -119,7 +124,6 @@ endif - # is the system crt0 for arm and aarch64 new enough to know about SBAT? - if objcopy_manualsymbols - if get_option('efi_sbat_distro_id') != '' -- arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch) - cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt)) - if cmd.returncode() != 0 - warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt))) -@@ -187,6 +191,12 @@ efi_ldflags = ['-T', - '-L', efi_libdir, - join_paths(efi_crtdir, arch_crt)] - -+if host_cpu == 'aarch64' -+# Don't use 64KiB pages -+ efi_ldflags += ['-z', 'common-page-size=4096'] -+ efi_ldflags += ['-z', 'max-page-size=4096'] -+endif -+ - if objcopy_manualsymbols - # older objcopy for Aarch64 and ARM32 are not EFI capable. - # Use 'binary' instead, and add required symbols manually. --- -2.34.1 - diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild index 5a890daf01a9..d3b1a784c4aa 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit meson python-any-r1 secureboot toolchain-funcs +inherit meson python-any-r1 secureboot DESCRIPTION="EFI executable for fwupd" HOMEPAGE="https://fwupd.org" @@ -15,26 +15,20 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git" else SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="" +# uswid is used as a CLI tool, hence no Pythonic stuff BDEPEND="$(python_gen_any_dep ' dev-python/pefile[${PYTHON_USEDEP}] ') + sys-apps/uswid virtual/pkgconfig" -DEPEND="sys-boot/gnu-efi" - -RDEPEND="!<sys-apps/fwupd-1.6.0" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4-efi_ld_override.patch # Bug #892339 - "${FILESDIR}"/${PN}-1.4-uefi_210_fixes.patch -) +DEPEND=">=sys-boot/gnu-efi-3.0.18" python_check_deps() { python_has_version "dev-python/pefile[${PYTHON_USEDEP}]" @@ -53,7 +47,6 @@ src_prepare() { src_configure() { local emesonargs=( - -Defi-ld="$(tc-getLD)" -Defi-libdir="${EPREFIX}"/usr/$(get_libdir) -Defi_sbat_distro_id="gentoo" -Defi_sbat_distro_summary="Gentoo GNU/Linux" |