commit: 37f0cbea5b1a7c5eae2840df4a0f01d5b6f41e3d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 10:26:02 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:03:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f0cbea
sys-apps/fwupd: add 1.9.6, remove old
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 3 +-
.../fwupd/files/fwupd-1.9.6-fragile_tests.patch | 28 +++
sys-apps/fwupd/fwupd-1.8.15.ebuild | 193 ---------------------
.../{fwupd-1.9.5.ebuild => fwupd-1.9.6.ebuild} | 16 +-
sys-apps/fwupd/metadata.xml | 1 +
5 files changed, 37 insertions(+), 204 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 7215fc15d341..51548f44ce8f 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,2 @@
-DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B
1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa
SHA512
c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B
2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb
SHA512
53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
-DIST fwupd-1.9.5.tar.xz 3847088 BLAKE2B
0926f97a79d7795f3bd8ea71841a072b8f725800d9b33eaf6fc54c62e67f53e41faa5558979a53b0e83094d8dfd3b3263bc462380498c00484e29500ca6baf8c
SHA512
19c152746d4d44f00c5bf3ed36b97249cb0a8fdedab351706a7d4e761fb142d096351555392b535ce976cb9e925505246542525a90319a2560f753a675ff26cf
+DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B
8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c
SHA512
c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
diff --git a/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
new file mode 100644
index 000000000000..cc40dc7c9e01
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.9.6-fragile_tests.patch
@@ -0,0 +1,28 @@
+umockdev-based tests appear not to play nicely with the sandbox,
+often they work but on some systems they persistently fail.
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -457,6 +457,11 @@
+ value: true,
+ description: 'enable tests',
+ )
++option('test-full',
++ type: 'boolean',
++ value: false,
++ description: 'enable tests known to be fragile when called from Gentoo
ebuilds'
++)
+ option('curl',
+ type: 'feature',
+ description: 'libcurl support',
+--- a/plugins/thunderbolt/meson.build
++++ b/plugins/thunderbolt/meson.build
+@@ -19,7 +19,7 @@
+ plugin_builtins += plugin_builtin_thunderbolt
+
+ # we use functions from 2.52 in the tests
+-if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and
gio.version().version_compare('>= 2.52')
++if get_option('tests') and get_option('test-full') and
run_sanitize_unsafe_tests and umockdev.found() and
gio.version().version_compare('>= 2.52')
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/fwupd-1.8.15.ebuild
b/sys-apps/fwupd/fwupd-1.8.15.ebuild
deleted file mode 100644
index c4692391da4b..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.15.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and
reliable"
-HOMEPAGE="https://fwupd.org";
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz";
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot
flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager
nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( elogind minimal systemd )
- dell? ( uefi )
- fastboot? ( gusb )
- logitech? ( gusb )
- minimal? ( !introspection )
- modemmanager? ( gusb )
- spi? ( lzma )
- synaptics? ( gnutls )
- test? ( archive gusb )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- >=dev-util/meson-0.60.0
- virtual/pkgconfig
- gtk-doc? (
- $(python_gen_cond_dep '
- >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
- ')
- >=dev-util/gi-docgen-2021.1
- )
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- introspection? ( dev-libs/gobject-introspection )
- test? (
- dev-util/umockdev
- net-libs/gnutls[tools]
- )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-arch/gcab-1.0
- app-arch/xz-utils
- >=dev-libs/glib-2.58:2
- dev-libs/json-glib
- dev-libs/libgudev:=
- >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
- >=dev-libs/libxmlb-0.1.13:=[introspection?]
- $(python_gen_cond_dep '
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
- net-misc/curl
- archive? ( app-arch/libarchive:= )
- cbor? ( dev-libs/libcbor:= )
- dell? (
- >=app-crypt/tpm2-tss-2.0
- >=sys-libs/libsmbios-2.4.0
- )
- elogind? ( >=sys-auth/elogind-211 )
- flashrom? ( >=sys-apps/flashrom-1.2-r3 )
- gnutls? ( net-libs/gnutls )
- gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
- logitech? ( dev-libs/protobuf-c:= )
- lzma? ( app-arch/xz-utils )
- modemmanager? ( net-misc/modemmanager[qmi] )
- policykit? ( >=sys-auth/polkit-0.114 )
- sqlite? ( dev-db/sqlite )
- systemd? ( >=sys-apps/systemd-211 )
- tpm? ( app-crypt/tpm2-tss:= )
- uefi? (
- sys-apps/fwupd-efi
- sys-boot/efibootmgr
- sys-fs/udisks
- sys-libs/efivar
- )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
-)
-
-src_prepare() {
- default
-
- vala_setup
-
- # c.f. https://github.com/fwupd/fwupd/issues/1414
- sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout :
120)/d" \
- -i plugins/thunderbolt/meson.build || die
-
- sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
- -i docs/meson.build || die
-
- python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
- local plugins=(
- -Dplugin_gpio="enabled"
- $(meson_feature amt plugin_intel_me)
- $(meson_feature dell plugin_dell)
- $(meson_feature fastboot plugin_fastboot)
- $(meson_feature flashrom plugin_flashrom)
- $(meson_feature gusb plugin_uf2)
- $(meson_feature logitech plugin_logitech_bulkcontroller)
- $(meson_feature modemmanager plugin_modem_manager)
- $(meson_feature nvme plugin_nvme)
- $(meson_use spi plugin_intel_spi)
- $(meson_feature synaptics plugin_synaptics_mst)
- $(meson_feature synaptics plugin_synaptics_rmi)
- $(meson_feature tpm plugin_tpm)
- $(meson_feature uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_feature uefi plugin_uefi_pk)
- )
- if use ppc64 || use riscv ; then
- plugins+=( -Dplugin_msr="disabled" )
- fi
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="disabled"
- -Dcurl="enabled"
- -Defi_binary="false"
- -Dman="true"
- -Dsupported_build="enabled"
- -Dudevdir="${EPREFIX}$(get_udevdir)"
- $(meson_feature archive libarchive)
- $(meson_use bash-completion bash_completion)
- $(meson_feature bluetooth bluez)
- $(meson_feature cbor)
- $(meson_feature elogind)
- $(meson_feature gnutls)
- $(meson_feature gtk-doc docs)
- $(meson_feature gusb)
- $(meson_feature lzma)
- $(meson_feature introspection)
- $(meson_feature policykit polkit)
- $(meson_feature sqlite)
- $(meson_feature systemd)
- $(meson_use test tests)
-
- ${plugins[@]}
- )
- use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
- export CACHE_DIRECTORY="${T}"
- meson_src_configure
-}
-
-src_test() {
- LC_ALL="C" meson_src_test
-}
-
-src_install() {
- meson_src_install
-
- if ! use minimal ; then
- newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
- if ! use systemd ; then
- # Don't timeout when fwupd is running (#673140)
- sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
- -i "${ED}"/etc/${PN}/daemon.conf || die
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- use minimal || udev_reload
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/fwupd-1.9.5.ebuild
b/sys-apps/fwupd/fwupd-1.9.6.ebuild
similarity index 91%
rename from sys-apps/fwupd/fwupd-1.9.5.ebuild
rename to sys-apps/fwupd/fwupd-1.9.6.ebuild
index b21f1294049f..09477afb6ce6 100644
--- a/sys-apps/fwupd/fwupd-1.9.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.6.ebuild
@@ -14,10 +14,9 @@
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz";
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot
flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager
nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot
flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager
nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( elogind minimal systemd )
- dell? ( uefi )
fastboot? ( gusb )
logitech? ( gusb )
minimal? ( !introspection )
@@ -31,6 +30,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
BDEPEND="$(vala_depend)
+ $(python_gen_cond_dep '
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
>=dev-util/meson-0.60.0
virtual/pkgconfig
gtk-doc? (
@@ -60,10 +62,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=net-misc/curl-7.62.0
archive? ( app-arch/libarchive:= )
cbor? ( >=dev-libs/libcbor-0.7.0:= )
- dell? (
- >=app-crypt/tpm2-tss-2.0
- >=sys-libs/libsmbios-2.4.0
- )
elogind? ( >=sys-auth/elogind-211 )
flashrom? ( >=sys-apps/flashrom-1.2-r3 )
gnutls? ( >=net-libs/gnutls-3.6.0 )
@@ -90,11 +88,11 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
x11-libs/pango[introspection]
+ amdgpu? ( sys-kernel/linux-headers )
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.4-fragile_tests.patch
- "${FILESDIR}"/${PN}-1.9.5-parallel_build.patch
+ "${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
)
pkg_pretend() {
@@ -121,8 +119,8 @@ src_prepare() {
src_configure() {
local plugins=(
-Dplugin_gpio="enabled"
+ $(meson_feature amdgpu plugin_amdgpu)
$(meson_feature amt plugin_intel_me)
- $(meson_feature dell plugin_dell)
$(meson_feature fastboot plugin_fastboot)
$(meson_feature flashrom plugin_flashrom)
$(meson_feature gusb plugin_uf2)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 8568986b263b..e4d8831cb829 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for
archives support</flag>
+ <flag name="amdgpu">Build and install AMD dGPU (Navi3x and
above) plugin</flag>
<flag name="amt">Build and install Intel AMT plugin</flag>
<flag name="cbor">Enable CBOR support for coSWID and uSWID via
<pkg>dev-libs/libcbor</pkg></flag>
<flag name="dell">Enable Dell-specific support</flag>
