commit: 5384be291948c734f441e772b1f1933c578dc13f Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Feb 28 09:44:27 2022 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Feb 28 09:46:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5384be29
sys-apps/fwupd: Removed old Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/fwupd/Manifest | 1 - sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch | 55 -------- sys-apps/fwupd/fwupd-1.7.4.ebuild | 178 ------------------------ 3 files changed, 234 deletions(-) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index b613b94ed5da..c7fc8c92a4c5 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,4 +1,3 @@ DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521 -DIST fwupd-1.7.4.tar.gz 4002584 BLAKE2B 6d01ee3993cc2a55164fd6ae468c00430fdc63b737abbad3dd279ef061625de4e2540d76b7069757753a9e94c1afc3635b565a25758c9d616e0d467212fd4751 SHA512 fa7195e2873a55fe544636c639597b4b2bac0855b10df4fac075ce377b87ae2aa2ccd86fb173379d39ebff542acca33e97234fd6c946e12b212dcf88b5f378a1 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31 DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b diff --git a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch b/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch deleted file mode 100644 index 968a0e7222d3..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e74d38bfd3097471fe60dbe843a68c16516a78da Mon Sep 17 00:00:00 2001 -From: Richard Hughes <[email protected]> -Date: Mon, 17 Jan 2022 14:50:47 +0000 -Subject: [PATCH] Fix compiling with new versions of efivar - -Fixes https://github.com/fwupd/fwupd/issues/4181 ---- - meson.build | 5 +++++ - plugins/uefi-capsule/fu-uefi-common.h | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/meson.build b/meson.build -index 833bdbf56..691cc8a58 100644 ---- a/meson.build -+++ b/meson.build -@@ -412,6 +412,11 @@ endif - if build_standalone and get_option('plugin_uefi_capsule') - efiboot = dependency('efiboot') - -+ efivar = dependency('efivar') -+ if cc.has_header_symbol('efivar/efivar-types.h', 'efi_time_t', dependencies : efivar) -+ conf.set('HAVE_EFI_TIME_T', '1') -+ endif -+ - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') - conf.set_quoted('EFI_APP_LOCATION', efi_app_location) - -diff --git a/plugins/uefi-capsule/fu-uefi-common.h b/plugins/uefi-capsule/fu-uefi-common.h -index a21806d6b..1d616c9e0 100644 ---- a/plugins/uefi-capsule/fu-uefi-common.h -+++ b/plugins/uefi-capsule/fu-uefi-common.h -@@ -9,6 +9,7 @@ - - #include <fwupdplugin.h> - -+#include <efivar/efivar.h> - #include <glib.h> - - #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET 0x00010000 -@@ -17,6 +18,7 @@ - - #define EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED 0x0000000000000004ULL - -+#ifndef HAVE_EFI_TIME_T - typedef struct __attribute__((__packed__)) { - guint16 year; - guint8 month; -@@ -30,6 +32,7 @@ typedef struct __attribute__((__packed__)) { - guint8 daylight; - guint8 pad2; - } efi_time_t; -+#endif - - typedef struct __attribute__((__packed__)) { - fwupd_guid_t guid; diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild deleted file mode 100644 index aaed0839779c..000000000000 --- a/sys-apps/fwupd/fwupd-1.7.4.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 linux-info meson python-single-r1 vala 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 ~ppc64 ~riscv ~x86" -IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - fastboot? ( gusb ) - logitech? ( gusb ) - minimal? ( !introspection ) - spi? ( lzma ) - synaptics? ( gnutls ) - uefi? ( gnutls ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - bash-completion? ( >=app-shells/bash-completion-2.0 ) - 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 - app-arch/xz-utils - >=dev-libs/glib-2.58:2 - dev-libs/json-glib - dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[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:= ) - 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?] ) - logitech? ( dev-libs/protobuf-c:= ) - lzma? ( app-arch/xz-utils ) - modemmanager? ( net-misc/modemmanager[qmi] ) - policykit? ( >=sys-auth/polkit-0.103 ) - 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 - ) -" -# 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.7.4-efivar38.patch" #831327 -) - -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 fastboot plugin_fastboot) - $(meson_use flashrom plugin_flashrom) - $(meson_use gusb plugin_uf2) - $(meson_use logitech plugin_logitech_bulkcontroller) - $(meson_use modemmanager plugin_modem_manager) - $(meson_use nvme plugin_nvme) - $(meson_use sqlite) - $(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" ) - use riscv && 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 archive libarchive) - $(meson_use bash-completion bash_completion) - $(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 -}
