From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/, sys-apps/fwupd/files/
Date: Thu, 10 Nov 2022 00:42:25 +0000 (UTC) [thread overview]
Message-ID: <1668040935.6e549e69bee4860b4a8e387bfb4cd61734eb9a2a.marecki@gentoo> (raw)
commit: 6e549e69bee4860b4a8e387bfb4cd61734eb9a2a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 00:23:48 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 00:42:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e549e69
sys-apps/fwupd: drop 1.8.3, 1.8.4
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/Manifest | 2 -
.../fwupd/files/fwupd-1.8.3-docgen_deps_test.patch | 16 --
.../files/fwupd-1.8.3-gresource_quirks_paths.patch | 11 --
.../fwupd/files/fwupd-1.8.3-installed_tests.patch | 215 ---------------------
sys-apps/fwupd/fwupd-1.8.3.ebuild | 208 --------------------
sys-apps/fwupd/fwupd-1.8.4.ebuild | 205 --------------------
6 files changed, 657 deletions(-)
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e0eab0f3b1c5..b0ed0d827c15 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,2 @@
-DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
-DIST fwupd-1.8.4.tar.xz 3269648 BLAKE2B 20857c5de6194a561c587ace0463d94440d25256a04cce51b77f3dcffde9b0f08a03a03e1d0dbb5f15016169f9a31e290609b3fc3f68b40b932c77335f05ec6f SHA512 569d0cb81f9a29259d0a7ae7100ca1063d20557b56903f80c1466667baf40a74d677f48159e5bd53ab6b33de8ce7185bf279b6dbcf6edfee744c1d4965c5db8f
DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
DIST fwupd-1.8.6.tar.xz 3306416 BLAKE2B d19ad5ce1227810e9ecd8d6e57d9c6902371fbb33763faa04750fc58f508b29ed529b9e39f2efd959f899ffb9df6ff7c3b194896e5af636413945fef48710c31 SHA512 c04c9f9e0d46b42c4c4c56738bd9c53a7e17a873defaebe5e262953314f6311937cd0c38db21d4bc9b481760e490024e6c4c059bb73206ed02f24216dd65a74d
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
deleted file mode 100644
index 297bde7d1740..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-test-deps.py attempts to check the version of dev-python/markdown used
-by dev-util/gi-docgen by importing it. However, on Gentoo there is no
-guarantee that the gi-docgen executable and fwupd build scripts use
-the same Python interpreter.
-
---- a/meson.build
-+++ b/meson.build
-@@ -542,7 +542,7 @@
- fwupd_gir = []
- introspection = get_option('introspection').disable_auto_if(host_machine.system() != 'linux')
- r = run_command([python3, 'docs/test-deps.py'])
--docs_python_deps = get_option('docs').require(r.returncode() == 0, error_message: r.stdout())
-+docs_python_deps = get_option('docs')
- gidocgen_dep = dependency('gi-docgen',
- version: '>= 2021.1',
- native: true,
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
deleted file mode 100644
index f4f628adc7c2..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -154,7 +154,7 @@
- error_message: 'meson >= 0.63.0 is needed for -Dgresource_quirks=enabled').allowed()
- fwupd_gresource_xml = custom_target('fwupd-resources-xml',
- input : [
-- 'org.freedesktop.fwupd.xml',
-+ join_paths(meson.current_source_dir(), 'org.freedesktop.fwupd.xml'),
- ] + plugin_quirks,
- output : 'fwupd.gresource.xml',
- command : [
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch
deleted file mode 100644
index be97e6a61d20..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
- subdir('fish-completion')
- endif
-
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
-
--if get_option('tests')
-- if build_daemon
-- subdir('installed-tests')
-- endif
--endif
--
- if build_standalone
- install_data(['daemon.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -49,7 +49,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('acpi-dmar-self-test', e, env: env) # added to installed-tests
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -47,7 +47,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('acpi-facp-self-test', e, env: env) # added to installed-tests
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -49,7 +49,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('acpi-ivrs-self-test', e, env: env) # added to installed-tests
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -53,7 +53,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('acpi-phat-self-test', e, env: env) # added to installed-tests
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -53,7 +53,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('ata-self-test', e, env: env) # added to installed-tests
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -35,8 +35,6 @@
- )
-
- if get_option('tests')
-- install_data(['tests/bcm57xx.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -63,7 +61,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('bcm57xx-self-test', e, env: env)
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -37,8 +37,6 @@
- endif
-
- if get_option('tests')
-- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -64,7 +62,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('ccgx-self-test', e, env: env)
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -33,8 +33,6 @@
- endif
-
- if get_option('tests')
-- install_data(['tests/elantp.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -57,7 +55,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('elantp-self-test', e, env: env)
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -44,7 +44,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('linux-swap-self-test', e) # added to installed-tests
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -46,7 +46,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('mtd-self-test', e) # added to installed-tests
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -47,7 +47,6 @@
- link_with: [
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('nitrokey-self-test', e) # added to installed-tests
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -31,8 +31,6 @@
- )
-
- if get_option('tests')
-- install_data(['tests/pixart.builder.xml'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -55,7 +53,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('pxi-self-test', e, env: env)
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -47,14 +47,6 @@
- )
-
- if get_option('tests')
-- install_data(['tests/redfish-smbios.bin'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
-- install_data(['tests/redfish.conf'],
-- install_dir: join_paths(installed_test_datadir, 'tests'))
-- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
-- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
-- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
- env = environment()
- env.set('G_TEST_SRCDIR', meson.current_source_dir())
- env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -89,7 +81,6 @@
- fwupd,
- fwupdplugin,
- ],
-- install: true,
- install_dir: installed_test_bindir,
- )
- test('redfish-self-test', e, env: env) # added to installed-tests
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,7 @@
- output: '@0@.gz'.format(input_file),
- capture: true,
- command: [gzip, '--keep', '--stdout', '@INPUT@'],
-- install: true,
-+ install: false,
- install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
- )
- endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
deleted file mode 100644
index 27984e59c834..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit linux-info 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}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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 +man 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 )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- >=dev-util/meson-0.60.0
- virtual/pkgconfig
- gtk-doc? (
- >=dev-util/gi-docgen-2021.1
- )
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- 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-libs/libsoup-2.51.92:2.4[introspection?]
- 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.3-docgen_deps_test.patch
- "${FILESDIR}"/${PN}-1.8.3-gresource_quirks_paths.patch
- "${FILESDIR}"/${PN}-1.8.3-installed_tests.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
-
- 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 '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/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() {
- # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
- # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
- local plugins=(
- -Dplugin_gpio="enabled"
- $(meson_feature amt plugin_amt)
- $(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"
- -Dgresource_quirks="disabled"
- -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_use man)
- $(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_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.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild
deleted file mode 100644
index df9202e9d65c..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit linux-info 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 +man 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 )
- uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
- >=dev-util/meson-0.60.0
- virtual/pkgconfig
- gtk-doc? (
- >=dev-util/gi-docgen-2021.1
- )
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- introspection? ( dev-libs/gobject-introspection )
- man? (
- app-text/docbook-sgml-utils
- sys-apps/help2man
- )
- 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-libs/libsoup-2.51.92:2.4[introspection?]
- 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.3-docgen_deps_test.patch
- "${FILESDIR}"/${PN}-1.8.4-installed_tests.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
-
- 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 '/platform-integrity/d' \
- -i plugins/meson.build || die #753521
-
- sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
- -i docs/meson.build || die
-
- python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
- # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
- # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
- local plugins=(
- -Dplugin_gpio="enabled"
- $(meson_feature amt plugin_amt)
- $(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"
- -Dgresource_quirks="disabled"
- -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_use man)
- $(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_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
-}
next reply other threads:[~2022-11-10 0:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 0:42 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-03 2:00 [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/, sys-apps/fwupd/files/ Sam James
2025-10-03 1:44 Sam James
2025-05-23 6:15 Sam James
2023-05-21 11:25 Marek Szuba
2023-02-24 16:50 Marek Szuba
2023-02-24 16:50 Marek Szuba
2023-01-24 11:01 Marek Szuba
2022-10-13 9:31 Marek Szuba
2022-08-21 1:16 Marek Szuba
2022-07-27 22:43 Marek Szuba
2022-07-27 13:10 Marek Szuba
2022-01-17 16:08 Lars Wendler
2022-01-10 14:13 Lars Wendler
2021-11-12 18:59 Mike Gilbert
2021-10-31 2:46 Sam James
2021-06-15 12:21 Thomas Deutschmann
2021-04-13 21:53 Lars Wendler
2021-03-24 16:07 Matt Turner
2020-06-19 6:35 Lars Wendler
2019-05-20 14:13 Lars Wendler
2019-02-25 12:01 Andreas Sturmlechner
2019-02-14 1:30 Lars Wendler
2017-12-03 13:55 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1668040935.6e549e69bee4860b4a8e387bfb4cd61734eb9a2a.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox