diff options
Diffstat (limited to 'sys-apps/fwupd')
| -rw-r--r-- | sys-apps/fwupd/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch | 27 | ||||
| -rw-r--r-- | sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch | 24 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.6.2.ebuild | 176 | ||||
| -rw-r--r-- | sys-apps/fwupd/metadata.xml | 1 |
5 files changed, 233 insertions, 1 deletions
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index bc6630fdee72..cfa877a4e981 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,8 +1,12 @@ AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb AUX fwupd-1.6.1-fix-python-detection.patch 1897 BLAKE2B 4c33cca345113fcae867b55e8575ac2da89c13cb76c9245201f2118695d319dd5795656a5c70151466973f19a8ffaf6d385255eb49e834e40aa6cf937fb0e6a8 SHA512 2174d2a9f99d444ec846adffc5c62a14553274d11072ef9ddcb78a3044a03c8c33d9f9e1c54604facde270a6d135b65cdb6d5fe9f20cf075181e19012545adf9 +AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461 +AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c +DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506 EBUILD fwupd-1.6.1-r1.ebuild 4374 BLAKE2B 4081625c0d91e6d318e84ba368fa5abe96f3a6bcbf690ffde03d4995cd53d4ba2dcdea7c7b869da9fc29a0e00957a35de93376c9f49e6c2790103e80ddd7e134 SHA512 599c623fecd7dc801673cad0480c042eb7bc9095e74dcbf7d6431337916deb17a211d6c90cf12b4dc9ea0a3a111be6cdec34e91efc4d9b981f04d81088fa1367 -MISC metadata.xml 1273 BLAKE2B e58cbe75ac3cf69ef5f70b831617f0a6c268d8270263cfa005046120eeeac464aa70024ae7b5ffb5a4526c948070d55cfcb6b927ea03c660db91c7cadc86417f SHA512 b024927cfdf78d1ec6ac33a1e04a2c6f7b9397a3cbd0334bcc13e964f2f8f5b01fe50a4b0bea896cf8b6e491b33473d0ba9a7f87edb47fd3b0d3e63a919b0909 +EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea +MISC metadata.xml 1347 BLAKE2B 93c3805765fb699b8325f80aef9bdc1281d80619ae74a89fc95d764f7a52ccf50e97425360779a66231a8bb8013e4d5e90649f7c7ab8cca8ccfd2938a2377b38 SHA512 8e50016bb8339b9b278c19a6e580cfcd3426d0b6fb186cde07c4535f48c5bd7a8a4437338360a10ea4550504242722ab2ed99bb4573b8e8809de0015db25ddc2 diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch new file mode 100644 index 000000000000..99434fe226f8 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch @@ -0,0 +1,27 @@ +From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Wed, 4 Aug 2021 15:38:59 +0200 +Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is + only available in >=libxmlb-0.2.2 + +Closes: https://github.com/fwupd/fwupd/issues/3600 +--- + plugins/modem-manager/fu-firehose-updater.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c +index 00fcdf607..076aa79cc 100644 +--- a/plugins/modem-manager/fu-firehose-updater.c ++++ b/plugins/modem-manager/fu-firehose-updater.c +@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max + + action = xb_node_get_element (node); + ++#if LIBXMLB_CHECK_VERSION(0,2,2) + cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error); ++#else ++ cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error); ++#endif + if (cmd_str == NULL) + return FALSE; + cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str)); diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch new file mode 100644 index 000000000000..162cc194a2ad --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch @@ -0,0 +1,24 @@ +From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Wed, 4 Aug 2021 15:11:26 +0200 +Subject: [PATCH] dell-dock plugin requires gusb + +Closes: https://github.com/fwupd/fwupd/issues/3598 +--- + plugins/dell-dock/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build +index 829771de1..ae8f67f33 100644 +--- a/plugins/dell-dock/meson.build ++++ b/plugins/dell-dock/meson.build +@@ -1,3 +1,4 @@ ++if get_option('gusb') + cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"'] + + install_data(['dell-dock.quirk'], +@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock', + gudev, + ], + ) ++endif diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild new file mode 100644 index 000000000000..aa776823c5e4 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.6.2.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit linux-info meson python-single-r1 vala xdg toolchain-funcs + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:= + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/libelf:0= + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=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?] ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + !<sci-chemistry/chemical-mime-data-0.1.94-r4 + ${COMMON_DEPEND} + sys-apps/dbus +" + +DEPEND=" + ${COMMON_DEPEND} + x11-libs/pango[introspection] +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch + "${FILESDIR}"/${P}-dell-dock-requires-gusb.patch + "${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + if use nvme ; then + kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" + fi +} + +src_prepare() { + default + # 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 '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_altos) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use agent) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +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 +} diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml index f746f9116957..57762c975d6f 100644 --- a/sys-apps/fwupd/metadata.xml +++ b/sys-apps/fwupd/metadata.xml @@ -17,6 +17,7 @@ <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag> <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag> <flag name="nvme">Build and install NVMe plugin</flag> + <flag name="modemmanager">Build and install Modem Manager plugin</flag> <flag name="spi">Install Intel-SPI plugin</flag> <flag name="synaptics">Install synaptics plugin</flag> <flag name="thunderbolt">Install Thunderbolt plugin</flag> |