[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 367684adf92754615f0ca9b20395b415abed451c Author: Arthur Zamarin gentoo org> AuthorDate: Wed Apr 24 17:28:28 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Apr 24 17:28:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367684ad sys-apps/fwupd-efi: Keyword 1.6 x86, #930564 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild index ccc75a2c9f42..d3b1a784c4aa 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 659f1d6280d78f951441a4af670c3d877ea7bdfb Author: Sam James gentoo org> AuthorDate: Wed Apr 24 14:06:51 2024 + Commit: Sam James gentoo org> CommitDate: Wed Apr 24 14:06:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659f1d62 sys-apps/fwupd-efi: Keyword 1.6 arm, #930564 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild index f8a9bd5b940b..b3fccc1a9add 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~riscv" + KEYWORDS="~amd64 ~arm ~riscv" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: d3d38560b005d6a1e9de1496f2ce58ca55a13b33 Author: Sam James gentoo org> AuthorDate: Wed Apr 24 14:06:53 2024 + Commit: Sam James gentoo org> CommitDate: Wed Apr 24 14:06:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d38560 sys-apps/fwupd-efi: Keyword 1.6 arm64, #930564 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild index b3fccc1a9add..ccc75a2c9f42 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/
commit: f4183f22a61fa11ddd19daf4eb141140f2bd0d51 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 24 13:12:56 2024 + Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 24 13:12:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4183f22 sys-apps/fwupd-efi: drop 1.4-r1 Signed-off-by: Marek Szuba gentoo.org> .../files/fwupd-efi-1.4-uefi_210_fixes.patch | 107 - sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild | 71 -- 2 files changed, 178 deletions(-) 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.. --- 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 -Date: Sat, 11 Feb 2023 15:39:06 + -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 - 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.4-r1.ebuild deleted file mode 100644 index 5a890daf01a9.. --- a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 1c93e3943bd0780238e0298f7712227bb1a65755 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 24 12:15:55 2024 + Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 24 12:16:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c93e394 sys-apps/fwupd-efi: keyword 1.6 for ~riscv Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild index c696b3067dfc..f8a9bd5b940b 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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" + KEYWORDS="~amd64 ~riscv" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 41d27e534ee69bed8bc29c21fabbb828ca1271e3 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 24 11:53:18 2024 + Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 24 11:58:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d27e53 sys-apps/fwupd-efi: add 1.6 Closes: https://bugs.gentoo.org/930102 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild | 64 + 2 files changed, 65 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index cbec4718721f..d28d3a021054 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,2 +1,3 @@ DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 DIST fwupd-efi-1.5.tar.xz 38460 BLAKE2B fe2d06e9d9a588b524a6a26afc401898f8dd1d3bd49fa608cfaa6c32ec71a88f125d2158e3892a44706cc2f8349ed379ee8d7b62bfbe8ba38990d1545eff9f94 SHA512 b1edaa1fa4b7e768ee822c92bdd2858343993f19edde6445e333fad470f997420aeab10dd36e5abff90cb0a87d8f3b2a0de9e7cf49a03758e0e1c9c2fd06ef19 +DIST fwupd-efi-1.6.tar.xz 39940 BLAKE2B 906f90a3187fb7d180dab22941d255220e3d56c2058ff6a5a260b0cd62c90e9c784a7c091da376111f23d02561abdec71958afec63c54134a77aac71deec20bc SHA512 37d3c1348bdead620e626a3e602dc6cd774c47d24ca18a3bf6aee071300d658bc4d37e6ec74fcd20f9b345141d69ea3343d44b9408af4759ad65ef10b72ead69 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild new file mode 100644 index ..c696b3067dfc --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild @@ -0,0 +1,64 @@ +# 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 + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = * ]]; then + inherit git-r3 + 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" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" + +# 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-3.0.18" + +python_check_deps() { + python_has_version "dev-python/pefile[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup + secureboot_pkg_setup +} + +src_prepare() { + default + + python_fix_shebang "${S}/efi" +} + +src_configure() { + local emesonargs=( + -Defi-libdir="${EPREFIX}"/usr/$(get_libdir) + -Defi_sbat_distro_id="gentoo" + -Defi_sbat_distro_summary="Gentoo GNU/Linux" + -Defi_sbat_distro_pkgname="${PN}" + -Defi_sbat_distro_version="${PVR}" + -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +} + +src_install() { + meson_src_install + secureboot_auto_sign +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: cceec97ea9b51b69a57cbc8229e10b16c00149b0 Author: Marek Szuba gentoo org> AuthorDate: Sun Apr 7 15:43:10 2024 + Commit: Marek Szuba gentoo org> CommitDate: Sun Apr 7 18:26:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cceec97e sys-apps/fwupd-efi: add 1.5 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.5.ebuild | 62 + 2 files changed, 63 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 3fad41df7a08..cbec4718721f 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1 +1,2 @@ DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 +DIST fwupd-efi-1.5.tar.xz 38460 BLAKE2B fe2d06e9d9a588b524a6a26afc401898f8dd1d3bd49fa608cfaa6c32ec71a88f125d2158e3892a44706cc2f8349ed379ee8d7b62bfbe8ba38990d1545eff9f94 SHA512 b1edaa1fa4b7e768ee822c92bdd2858343993f19edde6445e333fad470f997420aeab10dd36e5abff90cb0a87d8f3b2a0de9e7cf49a03758e0e1c9c2fd06ef19 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.5.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.5.ebuild new file mode 100644 index ..a136dde4ec54 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.5.ebuild @@ -0,0 +1,62 @@ +# 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 + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = * ]]; then + inherit git-r3 + 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" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" + +BDEPEND="$(python_gen_any_dep ' + dev-python/pefile[${PYTHON_USEDEP}] + ') + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +python_check_deps() { + python_has_version "dev-python/pefile[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup + secureboot_pkg_setup +} + +src_prepare() { + default + + python_fix_shebang "${S}/efi" +} + +src_configure() { + local emesonargs=( + -Defi-libdir="${EPREFIX}"/usr/$(get_libdir) + -Defi_sbat_distro_id="gentoo" + -Defi_sbat_distro_summary="Gentoo GNU/Linux" + -Defi_sbat_distro_pkgname="${PN}" + -Defi_sbat_distro_version="${PVR}" + -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +} + +src_install() { + meson_src_install + secureboot_auto_sign +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/
commit: 606aeaebf581d0e5c8bd771d6413a64676fec9cf Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 5 15:53:20 2023 + Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 5 15:56:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606aeaeb sys-apps/fwupd-efi: fix llvm-objcopy build error Upstream began passing --section-alignment to objcopy before 1.4 and that option remains unsupported by llvm-objcopy. However, the change has since been reverted as non-compliant. Closes: https://bugs.gentoo.org/919118 Signed-off-by: Marek Szuba gentoo.org> .../files/fwupd-efi-1.4-uefi_210_fixes.patch | 107 + sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild | 71 ++ 2 files changed, 178 insertions(+) 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 new file mode 100644 index ..d4de5f174857 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch @@ -0,0 +1,107 @@ +From bd958f2e8f03a85a7e1fe40a3ca7b78e0b24b79f Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Sat, 11 Feb 2023 15:39:06 + +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 +--- + 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.4-r1.ebuild new file mode 100644 index
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: a38125b65292be1d71ad69543fddc1cd78d7b7d8 Author: Piotr Karbowski gentoo org> AuthorDate: Wed Aug 9 18:11:07 2023 + Commit: Piotr Karbowski gentoo org> CommitDate: Wed Aug 9 18:14:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38125b6 sys-apps/fwupd-efi: drop myself as maintainer. Signed-off-by: Piotr Karbowski gentoo.org> sys-apps/fwupd-efi/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml index 1bc45134a1ea..e8bbd920f7b6 100644 --- a/sys-apps/fwupd-efi/metadata.xml +++ b/sys-apps/fwupd-efi/metadata.xml @@ -5,10 +5,6 @@ mare...@gentoo.org Marek Szuba - - slashbe...@gentoo.org - Piotr Karbowski - https://github.com/fwupd/fwupd-efi/issues fwupd/fwupd-efi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: a5f2857de81366dc6d8aba2daec31c16fbdc274f Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Jul 12 07:25:34 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Jul 20 11:32:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f2857d sys-apps/fwupd-efi: use secureboot.eclass to sign efi exec Signed-off-by: Andrew Ammerlaan gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index 873f7f279123..553f1fbfc16e 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 toolchain-funcs +inherit meson python-any-r1 secureboot toolchain-funcs DESCRIPTION="EFI executable for fwupd" HOMEPAGE="https://fwupd.org; @@ -39,6 +39,11 @@ python_check_deps() { python_has_version "dev-python/pefile[${PYTHON_USEDEP}]" } +pkg_setup() { + python-any-r1_pkg_setup + secureboot_pkg_setup +} + src_prepare() { default @@ -58,3 +63,8 @@ src_configure() { meson_src_configure } + +src_install() { + meson_src_install + secureboot_auto_sign +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 1b0e5679b33a10475e3de88d905d1730d02ce2ea Author: Marek Szuba gentoo org> AuthorDate: Thu Mar 30 11:28:58 2023 + Commit: Marek Szuba gentoo org> CommitDate: Thu Mar 30 11:28:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0e5679 sys-apps/fwupd-efi: drop 1.3 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 - sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 51 - 2 files changed, 52 deletions(-) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index da2a7c21860d..3fad41df7a08 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,2 +1 @@ -DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild deleted file mode 100644 index 728b9a2e949e.. --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="EFI executable for fwupd" -HOMEPAGE="https://fwupd.org; - -if [[ ${PV} = * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; -else - SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig" - -DEPEND="sys-boot/gnu-efi" - -RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; - ) - - meson_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 7e09f1464da2973facf4cf07ebf666df942ead21 Author: Sam James gentoo org> AuthorDate: Thu Mar 30 09:56:05 2023 + Commit: Sam James gentoo org> CommitDate: Thu Mar 30 09:56:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e09f146 sys-apps/fwupd-efi: Stabilize 1.4 x86, #903566 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index f53ba0969f20..873f7f279123 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 506c5c5d89afd7548a981db1e9e5b4b065b6261b Author: Sam James gentoo org> AuthorDate: Thu Mar 30 09:30:19 2023 + Commit: Sam James gentoo org> CommitDate: Thu Mar 30 09:30:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506c5c5d sys-apps/fwupd-efi: Stabilize 1.4 amd64, #903566 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index a10efcfde644..f53ba0969f20 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/
commit: 3e68014936059256d40d745a4e60dd46aeca52f9 Author: Marek Szuba gentoo org> AuthorDate: Mon Feb 27 12:53:56 2023 + Commit: Marek Szuba gentoo org> CommitDate: Mon Feb 27 13:15:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e680149 sys-apps/fwupd-efi: restore the old option for setting the linker Between 1.3 and 1.4, fwupd-efi upstream phased this option out in favour of using standard Meson toolchain management for both the compiler and the linker. However, the transition has not been completed yet and the linking phase still involves a custom target explicitly calling the linker executable - and the way the name of said executable is determined at the moment is not entirely robust. Closes: https://bugs.gentoo.org/892339 Signed-off-by: Marek Szuba gentoo.org> .../files/fwupd-efi-1.4-efi_ld_override.patch | 26 ++ sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild| 7 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch new file mode 100644 index ..0b703a41d2e6 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch @@ -0,0 +1,26 @@ +--- a/efi/meson.build b/efi/meson.build +@@ -1,6 +1,7 @@ + generate_sbat = find_program('generate_sbat.py', native: true) + generate_binary = find_program('generate_binary.py', native: true) + ++efi_ld = get_option('efi-ld') + efi_ldsdir = get_option('efi-ldsdir') + efi_incdir = get_option('efi-includedir') + +@@ -226,7 +227,7 @@ + so = custom_target('fwup.so', +input : [o_file1, o_file2, o_file3, o_file4, o_file5], +output : 'fwup.so', +- command : [ld, '-o', '@OUTPUT@'] + ++ command : [efi_ld, '-o', '@OUTPUT@'] + + efi_ldflags + ['@INPUT@'] + + ['-lefi', '-lgnuefi', libgcc_file_name], +depends: fwupd_so_deps) +--- a/meson_options.txt b/meson_options.txt +@@ -1,3 +1,4 @@ ++option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') + option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') + option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory') + option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory') diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index d90dd1db3a4e..a10efcfde644 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 +inherit meson python-any-r1 toolchain-funcs DESCRIPTION="EFI executable for fwupd" HOMEPAGE="https://fwupd.org; @@ -31,6 +31,10 @@ DEPEND="sys-boot/gnu-efi" RDEPEND="!
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: b6100ff363583e956224445378b5ca79e3fc8905 Author: Sam James gentoo org> AuthorDate: Fri Feb 24 22:19:48 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 24 22:19:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6100ff3 sys-apps/fwupd-efi: Keyword 1.4 arm, #892315 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index 6afdaf1dec4b..d90dd1db3a4e 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 6ff854ddcb569df2158234e9deb04c6b1ae0d52d Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jan 28 07:44:24 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jan 28 07:44:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff854dd sys-apps/fwupd-efi: Keyword 1.4 arm64, #892315 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild index 845fd79ccd63..6afdaf1dec4b 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 10641446426fa0e69818ef70060513e5d08411f1 Author: Marek Szuba gentoo org> AuthorDate: Fri Jan 27 22:45:21 2023 + Commit: Marek Szuba gentoo org> CommitDate: Fri Jan 27 22:49:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10641446 sys-apps/fwupd-efi: add 1.4 Now with xz-compressed source tarballs! Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild | 55 + 2 files changed, 56 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 0e8b6019fe90..da2a7c21860d 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1 +1,2 @@ DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb +DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild new file mode 100644 index ..845fd79ccd63 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit meson python-any-r1 + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = * ]]; then + inherit git-r3 + 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 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="$(python_gen_any_dep ' + dev-python/pefile[${PYTHON_USEDEP}] + ') + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 902e35a5c407338c87a39165b3a9f7564b97ad21 Author: Marek Szuba gentoo org> AuthorDate: Tue Aug 30 07:53:21 2022 + Commit: Marek Szuba gentoo org> CommitDate: Tue Aug 30 07:53:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902e35a5 sys-apps/fwupd-efi: drop 1.1 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 - sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild | 51 - 2 files changed, 52 deletions(-) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index b48706dafe78..0e8b6019fe90 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,2 +1 @@ -DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild deleted file mode 100644 index 00464ef3dc85.. --- a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="EFI executable for fwupd" -HOMEPAGE="https://fwupd.org; - -if [[ ${PV} = ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; -else - SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig" - -DEPEND="sys-boot/gnu-efi" - -RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; - ) - - meson_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 21d5ab13491fd703f4efec3d8c5c619da3d7ab77 Author: Sam James gentoo org> AuthorDate: Fri Aug 26 23:25:34 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 26 23:25:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d5ab13 sys-apps/fwupd-efi: Stabilize 1.3 amd64, #866512 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild index 3aca3e43e660..69a7f4ed58d6 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; else SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 6848b34916c6a41c30e9d5f941d5bd86e75263d1 Author: Sam James gentoo org> AuthorDate: Fri Aug 26 05:45:33 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 26 05:45:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6848b349 sys-apps/fwupd-efi: Stabilize 1.3 x86, #866512 Signed-off-by: Sam James gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild index ade0d8be03f8..3aca3e43e660 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; else SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 9541fad8fb8167c5f4b9fa6ceb58839139fd8014 Author: Marek Szuba gentoo org> AuthorDate: Thu Jul 28 12:10:05 2022 + Commit: Marek Szuba gentoo org> CommitDate: Thu Jul 28 13:03:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9541fad8 sys-apps/fwupd-efi: have the ebuilds set efi-libdir Upstream build scripts attempt to determine the ABI-correct libdir name by calling '${CC} -print-multi-os-directory', which does not work with clang. Fortunately, we have a perfectly good mechanism for this available to the ebuilds. Closes: https://bugs.gentoo.org/831970 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild index 7fff4de7760f..ade0d8be03f8 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -39,6 +39,7 @@ src_configure() { local emesonargs=( -Defi-cc="$(tc-getCC)" -Defi-ld="$(tc-getLD)" + -Defi-libdir="${EPREFIX}"/usr/$(get_libdir) -Defi_sbat_distro_id="gentoo" -Defi_sbat_distro_summary="Gentoo GNU/Linux" -Defi_sbat_distro_pkgname="${PN}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 0ffba731b16ef33665e9e931c337425cf5fa1d39 Author: Marek Szuba gentoo org> AuthorDate: Thu Jul 28 12:14:37 2022 + Commit: Marek Szuba gentoo org> CommitDate: Thu Jul 28 13:03:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ffba731 sys-apps/fwupd-efi: drop 1.2 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/Manifest | 1 - sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild | 50 - 2 files changed, 51 deletions(-) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 63732c3d4bf2..b48706dafe78 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,3 +1,2 @@ DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b -DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild deleted file mode 100644 index e7bb5a79d7d4.. --- a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="EFI executable for fwupd" -HOMEPAGE="https://fwupd.org; - -if [[ ${PV} = ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; -else - SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig" - -DEPEND="sys-boot/gnu-efi" - -RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; - ) - - meson_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 2065fa4d3d69d7ff1839caae767c540e26645c1e Author: Marek Szuba gentoo org> AuthorDate: Wed Jul 27 13:24:51 2022 + Commit: Marek Szuba gentoo org> CommitDate: Wed Jul 27 13:24:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2065fa4d sys-apps/fwupd-efi: enable py3.11 Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild index 936f5457e1d6..7fff4de7760f 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit meson python-any-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 09f7c5d70729f02ae468a27f3242b9b4a8c88856 Author: Piotr Karbowski gentoo org> AuthorDate: Sun Jul 3 18:40:23 2022 + Commit: Piotr Karbowski gentoo org> CommitDate: Sun Jul 3 18:41:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f7c5d7 sys-apps/fwupd-efi: joining as maintainer. Signed-off-by: Piotr Karbowski gentoo.org> sys-apps/fwupd-efi/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml index e8bbd920f7b6..1bc45134a1ea 100644 --- a/sys-apps/fwupd-efi/metadata.xml +++ b/sys-apps/fwupd-efi/metadata.xml @@ -5,6 +5,10 @@ mare...@gentoo.org Marek Szuba + + slashbe...@gentoo.org + Piotr Karbowski + https://github.com/fwupd/fwupd-efi/issues fwupd/fwupd-efi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: d1bdb1afe2e43abecc6ab4f384df3ce684ba05e1 Author: Marek Szuba gentoo org> AuthorDate: Wed Jun 29 10:56:51 2022 + Commit: Marek Szuba gentoo org> CommitDate: Wed Jun 29 10:56:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1bdb1af sys-apps/fwupd-efi: add myself as a maintainer Signed-off-by: Marek Szuba gentoo.org> sys-apps/fwupd-efi/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml index 771d90fee052..e8bbd920f7b6 100644 --- a/sys-apps/fwupd-efi/metadata.xml +++ b/sys-apps/fwupd-efi/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + + mare...@gentoo.org + Marek Szuba + https://github.com/fwupd/fwupd-efi/issues fwupd/fwupd-efi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 3075d40b2e3d52fa24841e437452164c02417c98 Author: Lars Wendler gentoo org> AuthorDate: Fri Apr 15 09:38:33 2022 + Commit: Lars Wendler gentoo org> CommitDate: Fri Apr 15 09:38:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3075d40b sys-apps/fwupd-efi: Bump to version 1.3 Signed-off-by: Lars Wendler gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild | 50 + 2 files changed, 51 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 7dd592521b8d..63732c3d4bf2 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,2 +1,3 @@ DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de +DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild new file mode 100644 index ..936f5457e1d6 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -0,0 +1,50 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit meson python-any-r1 toolchain-funcs + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; +else + SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 5cac77bb4df6bad3bcc9a5abf933090605e2d378 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jan 26 00:57:29 2022 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jan 26 02:31:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cac77bb sys-apps/fwupd-efi: bump to v1.2 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild | 50 + 2 files changed, 51 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 41334f096f0a..7dd592521b8d 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1 +1,2 @@ DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b +DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild new file mode 100644 index ..e7bb5a79d7d4 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 toolchain-funcs + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; +else + SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: d386352a0b36a07f8e484f2f709a15a3cccf8f19 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Dec 27 14:13:18 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Dec 27 14:13:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d386352a sys-apps/fwupd-efi: amd64 stable wrt bug #814932 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild index 80182c2abbad..00464ef3dc85 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; else SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 39c1764e5ba3c9fb2b9382603ed8c1e245766264 Author: Jakov Smolić gentoo org> AuthorDate: Mon Dec 27 09:51:44 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Dec 27 09:51:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c1764e sys-apps/fwupd-efi: Stabilize 1.1 x86, #814932 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild index fc3aa3397b23..80182c2abbad 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = ]]; then EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; else SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/
commit: 2001212dfe03599d6ef7bcde1ff5ae90bf8df23b Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jun 20 15:57:32 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jun 20 16:03:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2001212d sys-apps/fwupd-efi: drop old Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/Manifest| 1 - .../fwupd-efi-1.0-add-genpeimg-parameter.patch | 42 .../files/fwupd-efi-1.0-pass-genpeimg.patch| 21 sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild| 56 -- 4 files changed, 120 deletions(-) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 69e486bfbc6..41334f096f0 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,2 +1 @@ -DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch deleted file mode 100644 index a9791b4e114..000 --- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 14 May 2021 14:06:31 +0100 -Subject: [PATCH] generate_binary: add genpeimg option - -Add a --genpeimg option as the meson.build uses find_program(), so the -binary could be anywhere. - efi/generate_binary.py | 9 ++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/efi/generate_binary.py b/efi/generate_binary.py -index 0193e50..907af9f 100755 a/efi/generate_binary.py -+++ b/efi/generate_binary.py -@@ -48,13 +48,15 @@ def _run_objcopy(args): - - - def _run_genpeimg(args): -+if not args.genpeimg: -+return - --# this is okay if it does not exist --argv = ["genpeimg", "-d", "+d", "+n", "-d", "+s", args.outfile] -+argv = [args.genpeimg, "-d", "+d", "+n", "-d", "+s", args.outfile] - try: - subprocess.run(argv, check=True) - except FileNotFoundError as _: --pass -+print(str(e)) -+sys.exit(1) - - - if __name__ == "__main__": -@@ -63,6 +65,7 @@ def _run_genpeimg(args): - parser.add_argument( - "--objcopy", default="objcopy", help="Binary file to use for objcopy" - ) -+parser.add_argument("--genpeimg", help="Binary file to use for genpeimg") - parser.add_argument("--arch", default="x86_64", help="EFI architecture") - parser.add_argument("infile", help="Input file") - parser.add_argument("outfile", help="Output file") diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch deleted file mode 100644 index 7e4dd1af329..000 --- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 14 May 2021 14:07:11 +0100 -Subject: [PATCH] meson: pass the found genpeimg to generate_binary - - efi/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/efi/meson.build b/efi/meson.build -index a496210..7cc1da1 100644 a/efi/meson.build -+++ b/efi/meson.build -@@ -215,6 +215,7 @@ app = custom_target(efi_name, - '@INPUT@', '@OUTPUT@', - '--arch', gnu_efi_arch, - '--objcopy', efi_objcopy, -+ '--genpeimg', genpeimg.found() ? genpeimg : '' - ], - install : true, - install_dir : efi_app_location) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild deleted file mode 100644 index 1f99eec953e..000 --- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="EFI executable for fwupd" -HOMEPAGE="https://fwupd.org; - -if [[ ${PV} = ]]; then - inherit git-r3 -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: c3d3888b4bcd8a8c37c3c99189e041def5dd3777 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jun 20 15:55:41 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jun 20 16:03:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d3888b sys-apps/fwupd-efi: bump to v1.1 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild | 51 + 2 files changed, 52 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index bd3ce666cfb..69e486bfbc6 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1 +1,2 @@ DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4 +DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild new file mode 100644 index 000..fc3aa3397b2 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 toolchain-funcs + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; +else + SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="!https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/
commit: 36eb40e0d1be521917a2e4836ac4bbd89f9787a0 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jun 18 21:19:14 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jun 18 21:19:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36eb40e0 sys-apps/fwupd-efi: fix building Fixes PermissionError: [Errno 13] Permission denied: 'genpeimg' Closes: https://bugs.gentoo.org/796569 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> .../fwupd-efi-1.0-add-genpeimg-parameter.patch | 42 ++ .../files/fwupd-efi-1.0-pass-genpeimg.patch| 21 +++ sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild| 5 +++ 3 files changed, 68 insertions(+) diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch new file mode 100644 index 000..a9791b4e114 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch @@ -0,0 +1,42 @@ +From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 14 May 2021 14:06:31 +0100 +Subject: [PATCH] generate_binary: add genpeimg option + +Add a --genpeimg option as the meson.build uses find_program(), so the +binary could be anywhere. +--- + efi/generate_binary.py | 9 ++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/efi/generate_binary.py b/efi/generate_binary.py +index 0193e50..907af9f 100755 +--- a/efi/generate_binary.py b/efi/generate_binary.py +@@ -48,13 +48,15 @@ def _run_objcopy(args): + + + def _run_genpeimg(args): ++if not args.genpeimg: ++return + +-# this is okay if it does not exist +-argv = ["genpeimg", "-d", "+d", "+n", "-d", "+s", args.outfile] ++argv = [args.genpeimg, "-d", "+d", "+n", "-d", "+s", args.outfile] + try: + subprocess.run(argv, check=True) + except FileNotFoundError as _: +-pass ++print(str(e)) ++sys.exit(1) + + + if __name__ == "__main__": +@@ -63,6 +65,7 @@ def _run_genpeimg(args): + parser.add_argument( + "--objcopy", default="objcopy", help="Binary file to use for objcopy" + ) ++parser.add_argument("--genpeimg", help="Binary file to use for genpeimg") + parser.add_argument("--arch", default="x86_64", help="EFI architecture") + parser.add_argument("infile", help="Input file") + parser.add_argument("outfile", help="Output file") diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch new file mode 100644 index 000..7e4dd1af329 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch @@ -0,0 +1,21 @@ +From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 14 May 2021 14:07:11 +0100 +Subject: [PATCH] meson: pass the found genpeimg to generate_binary + +--- + efi/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/efi/meson.build b/efi/meson.build +index a496210..7cc1da1 100644 +--- a/efi/meson.build b/efi/meson.build +@@ -215,6 +215,7 @@ app = custom_target(efi_name, + '@INPUT@', '@OUTPUT@', + '--arch', gnu_efi_arch, + '--objcopy', efi_objcopy, ++ '--genpeimg', genpeimg.found() ? genpeimg : '' + ], + install : true, + install_dir : efi_app_location) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild index fc3aa3397b2..1f99eec953e 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild @@ -29,6 +29,11 @@ DEPEND="sys-boot/gnu-efi" RDEPEND="!
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 306db48797ce6d97f663a0af7aa7f790e9da Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jun 16 09:27:19 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jun 16 09:27:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306db487 sys-apps/fwupd-efi: set blocker on previous https://bugs.gentoo.org/796143 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild index a7b3986d18d..fc3aa3397b2 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild @@ -27,7 +27,7 @@ BDEPEND="${PYTHON_DEPS} DEPEND="sys-boot/gnu-efi" -RDEPEND="" +RDEPEND="!
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: d4293f27d9b694df4e2cb07864fbc38af6a794b7 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jun 15 22:59:07 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Jun 15 22:59:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4293f27 sys-apps/fwupd-efi: add myself as co-maintainer Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml index f1b7df54bcf..1dd34b6e139 100644 --- a/sys-apps/fwupd-efi/metadata.xml +++ b/sys-apps/fwupd-efi/metadata.xml @@ -5,6 +5,10 @@ polynomia...@gentoo.org Lars Wendler + + whi...@gentoo.org + Thomas Deutschmann + https://github.com/fwupd/fwupd-efi/issues fwupd/fwupd-efi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/
commit: 2054a6df41fe63be0a67dc4e60aa9dbd650daa88 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jun 15 22:28:32 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Jun 15 22:53:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2054a6df sys-apps/fwupd-efi: initial import Thanks-to: Joakim Tjernlund Closes: https://bugs.gentoo.org/791307 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/fwupd-efi/Manifest | 1 + sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild | 51 + sys-apps/fwupd-efi/metadata.xml | 12 3 files changed, 64 insertions(+) diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest new file mode 100644 index 000..bd3ce666cfb --- /dev/null +++ b/sys-apps/fwupd-efi/Manifest @@ -0,0 +1 @@ +DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild new file mode 100644 index 000..a7b3986d18d --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 toolchain-funcs + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org; + +if [[ ${PV} = ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git; +else + SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="" + +src_prepare() { + default + + python_fix_shebang "${S}/efi" +} + +src_configure() { + local emesonargs=( + -Defi-cc="$(tc-getCC)" + -Defi-ld="$(tc-getLD)" + -Defi-objcopy="$(tc-getOBJCOPY)" + -Defi_sbat_distro_id="gentoo" + -Defi_sbat_distro_summary="Gentoo GNU/Linux" + -Defi_sbat_distro_pkgname="${PN}" + -Defi_sbat_distro_version="${PVR}" + -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}; + ) + + meson_src_configure +} diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml new file mode 100644 index 000..f1b7df54bcf --- /dev/null +++ b/sys-apps/fwupd-efi/metadata.xml @@ -0,0 +1,12 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + polynomia...@gentoo.org + Lars Wendler + + + https://github.com/fwupd/fwupd-efi/issues + fwupd/fwupd-efi + +